Re-export hyper::Uri as shiplift::Uri (#209)

This patch removes the explicit dependency on the http crate and
instead accesses the re-exported version of hyper. This should make
the update process slightly easier because those versions would
need to be kept in sync manually.

We also re-export hyper::Uri as shiplift::Uri because it is part
of the public API of shiplift::Docker. This allows users to access
the Uri type without having to seperately depend on http or hyper.

1 files changed, 3 insertions, 4 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)
     }
 }