OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-12-22 22:46:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement From<_> for RequestError for more types

Browse source
This commit is contained in:
Maybe Waffle 2022-08-04 18:16:42 +04:00
parent 5a2bf5e1d9
commit 353d26fa00
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/errors.rs
View file

@ -12,7 +12,7 @@ use crate::types::ResponseParameters;
pub enum RequestError { pub enum RequestError {
/// A Telegram API error. /// A Telegram API error.
#[error("A Telegram's error: {0}")] #[error("A Telegram's error: {0}")]
Api(#[source] ApiError), Api(#[from] ApiError),
/// The group has been migrated to a supergroup with the specified /// The group has been migrated to a supergroup with the specified
/// identifier. /// identifier.
@ -26,7 +26,7 @@ pub enum RequestError {
/// Network error while sending a request to Telegram. /// Network error while sending a request to Telegram.
#[error("A network error: {0}")] #[error("A network error: {0}")]
// NOTE: this variant must not be created by anything except the From impl // NOTE: this variant must not be created by anything except the explicit From impl
Network(#[source] reqwest::Error), Network(#[source] reqwest::Error),
/// Error while parsing a response from Telegram. /// Error while parsing a response from Telegram.
@ -45,7 +45,7 @@ pub enum RequestError {
/// Occurs when trying to send a file to Telegram. /// Occurs when trying to send a file to Telegram.
#[error("An I/O error: {0}")] #[error("An I/O error: {0}")]
Io(#[source] io::Error), Io(#[from] io::Error),
} }
/// An error caused by downloading a file. /// An error caused by downloading a file.
@ -53,7 +53,7 @@ pub enum RequestError {
pub enum DownloadError { pub enum DownloadError {
/// A network error while downloading a file from Telegram. /// A network error while downloading a file from Telegram.
#[error("A network error: {0}")] #[error("A network error: {0}")]
// NOTE: this variant must not be created by anything except the From impl // NOTE: this variant must not be created by anything except the explicit From impl
Network(#[source] reqwest::Error), Network(#[source] reqwest::Error),
/// An I/O error while writing a file to destination. /// An I/O error while writing a file to destination.
@ -762,6 +762,32 @@ pub enum ApiError {
Unknown(String), Unknown(String),
} }
/// This impl allows to use `?` to propagate [`DownloadError`]s in function
/// returning [`RequestError`]s. For example:
///
/// ```rust
/// # use teloxide_core::errors::{DownloadError, RequestError};
///
/// async fn handler() -> Result<(), RequestError> {
/// download_file().await?; // `?` just works
///
/// Ok(())
/// }
///
/// async fn download_file() -> Result<(), DownloadError> {
/// /* download file here */
/// Ok(())
/// }
/// ```
impl From<DownloadError> for RequestError {
fn from(download_err: DownloadError) -> Self {
match download_err {
DownloadError::Network(err) => RequestError::Network(err),
DownloadError::Io(err) => RequestError::Io(err),
}
}
}
impl From<reqwest::Error> for DownloadError { impl From<reqwest::Error> for DownloadError {
fn from(error: reqwest::Error) -> Self { fn from(error: reqwest::Error) -> Self {
DownloadError::Network(hide_token(error)) DownloadError::Network(hide_token(error))