diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/errors.rs | 7 | ||||
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | src/transport.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/errors.rs b/src/errors.rs index 85e46b8..f0f70d7 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,6 +1,5 @@ //! Representations of various client errors -use http; use hyper::{self, StatusCode}; use serde_json::Error as SerdeError; use std::{error::Error as StdError, fmt, io::Error as IoError, string::FromUtf8Error}; @@ -9,7 +8,7 @@ use std::{error::Error as StdError, fmt, io::Error as IoError, string::FromUtf8E pub enum Error { SerdeJsonError(SerdeError), Hyper(hyper::Error), - Http(http::Error), + Http(hyper::http::Error), IO(IoError), Encoding(FromUtf8Error), InvalidResponse(String), @@ -29,8 +28,8 @@ impl From<hyper::Error> for Error { } } -impl From<http::Error> for Error { - fn from(error: http::Error) -> Error { +impl From<hyper::http::Error> for Error { + fn from(error: hyper::http::Error) -> Error { Error::Http(error) } } @@ -46,7 +46,8 @@ use crate::{ tty::TtyDecoder, }; use futures::{future::Either, Future, IntoFuture, Stream}; -use hyper::{client::HttpConnector, Body, Client, Method, Uri}; +pub use hyper::Uri; +use hyper::{client::HttpConnector, Body, Client, Method}; #[cfg(feature = "tls")] use hyper_openssl::HttpsConnector; #[cfg(feature = "unix-socket")] diff --git a/src/transport.rs b/src/transport.rs index 2887790..7cc1fb1 100644 --- a/src/transport.rs +++ b/src/transport.rs @@ -148,7 +148,7 @@ impl Transport { endpoint: &str, body: Option<(B, Mime)>, headers: Option<H>, - f: impl FnOnce(&mut ::http::request::Builder), + f: impl FnOnce(&mut ::hyper::http::request::Builder), ) -> Result<Request<Body>> where B: Into<Body>, |