From 276ead611f7dbf556b32f992556420fa423c0ec9 Mon Sep 17 00:00:00 2001 From: "David A. Ramos" Date: Tue, 26 Nov 2019 00:00:41 -0800 Subject: [PATCH] Add type aliases for reqwest errors --- src/reqwest/async_client.rs | 2 +- src/reqwest/mod.rs | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/reqwest/async_client.rs b/src/reqwest/async_client.rs index a431ea97..6ad5d342 100644 --- a/src/reqwest/async_client.rs +++ b/src/reqwest/async_client.rs @@ -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. diff --git a/src/reqwest/mod.rs b/src/reqwest/mod.rs index 13561794..edcd9d4a 100644 --- a/src/reqwest/mod.rs +++ b/src/reqwest/mod.rs @@ -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; #[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; #[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; #[cfg(any(feature = "reqwest", feature = "futures-03"))] mod blocking { @@ -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")] @@ -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; ///