Skip to content

Commit

Permalink
Add type aliases for reqwest errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ramosbugs committed Nov 26, 2019
1 parent dc36a34 commit 276ead6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/reqwest/async_client.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::Error;
use super::super::{HttpRequest, HttpResponse};

use reqwest_0_10 as reqwest;
pub use reqwest_0_10 as reqwest;

///
/// Asynchronous HTTP client.
Expand Down
21 changes: 18 additions & 3 deletions src/reqwest/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,27 @@ where

#[cfg(any(feature = "reqwest", feature = "futures-03"))]
pub use blocking::http_client;
///
/// Error type returned by failed reqwest blocking HTTP requests.
///
#[cfg(any(feature = "reqwest", feature = "futures-03"))]
pub type HttpClientError = Error<blocking::reqwest::Error>;

#[cfg(all(feature = "futures-01", feature = "reqwest"))]
pub use future_client::future_http_client;
///
/// Error type returned by failed reqwest futures HTTP requests.
///
#[cfg(all(feature = "futures-01", feature = "reqwest"))]
pub type FutureHttpClientError = Error<future_client::reqwest::Error>;

#[cfg(feature = "futures-03")]
pub use async_client::async_http_client;
///
/// Error type returned by failed reqwest async HTTP requests.
///
#[cfg(feature = "futures-03")]
pub type AsyncHttpClientError = Error<async_client::reqwest::Error>;

#[cfg(any(feature = "reqwest", feature = "futures-03"))]
mod blocking {
Expand All @@ -39,12 +54,12 @@ mod blocking {
#[cfg(not(feature = "futures-03"))]
use reqwest_0_9 as blocking;
#[cfg(not(feature = "futures-03"))]
use reqwest_0_9 as reqwest;
pub use reqwest_0_9 as reqwest;
#[cfg(not(feature = "futures-03"))]
use reqwest_0_9::RedirectPolicy;

#[cfg(feature = "futures-03")]
use reqwest_0_10 as reqwest;
pub use reqwest_0_10 as reqwest;
#[cfg(feature = "futures-03")]
use reqwest_0_10::blocking;
#[cfg(feature = "futures-03")]
Expand Down Expand Up @@ -87,7 +102,7 @@ mod future_client {
use super::super::{HttpRequest, HttpResponse};

use futures_0_1::{Future, IntoFuture, Stream};
use reqwest_0_9 as reqwest;
pub use reqwest_0_9 as reqwest;
use reqwest_0_9::r#async::Client as AsyncClient;

///
Expand Down

0 comments on commit 276ead6

Please sign in to comment.