diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2018-06-05 18:47:09 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2018-06-05 18:47:09 +0200 |
| commit | 5d2c20e2b5b93f5dd74b0faf016d67afc631b903 (patch) | |
| tree | 5d8886077932770fd15afe92455f1acbd2151420 /net/src/lib.rs | |
| parent | e475e149ec7d259bb57af24ad4b0b9b55e8116c4 (diff) | |
net: Bump hyper to "0.12", hyper-tls to "0.2".
Diffstat (limited to 'net/src/lib.rs')
| -rw-r--r-- | net/src/lib.rs | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/net/src/lib.rs b/net/src/lib.rs index d01aa93d..bb9c0bf4 100644 --- a/net/src/lib.rs +++ b/net/src/lib.rs @@ -36,6 +36,7 @@ extern crate sequoia_core; #[macro_use] extern crate failure; extern crate futures; +extern crate http; extern crate hyper; extern crate hyper_tls; extern crate native_tls; @@ -47,8 +48,8 @@ extern crate url; extern crate capnp_rpc; -use hyper::client::{FutureResponse, HttpConnector}; -use hyper::{Client, Request}; +use hyper::client::{ResponseFuture, HttpConnector}; +use hyper::{Client, Request, Body}; use hyper_tls::HttpsConnector; use native_tls::Certificate; use std::convert::From; @@ -114,24 +115,24 @@ impl KeyServer { } trait AClient { - fn do_get(&mut self, uri: Url) -> FutureResponse; - fn do_request(&mut self, request: Request) -> FutureResponse; + fn do_get(&mut self, uri: Url) -> ResponseFuture; + fn do_request(&mut self, request: Request<Body>) -> ResponseFuture; } impl AClient for Client<HttpConnector> { - fn do_get(&mut self, uri: Url) -> FutureResponse { + fn do_get(&mut self, uri: Url) -> ResponseFuture { self.get(url2uri(uri)) } - fn do_request(&mut self, request: Request) -> FutureResponse { + fn do_request(&mut self, request: Request<Body>) -> ResponseFuture { self.request(request) } } impl AClient for Client<HttpsConnector<HttpConnector>> { - fn do_get(&mut self, uri: Url) -> FutureResponse { + fn do_get(&mut self, uri: Url) -> ResponseFuture { self.get(url2uri(uri)) } - fn do_request(&mut self, request: Request) -> FutureResponse { + fn do_request(&mut self, request: Request<Body>) -> ResponseFuture { self.request(request) } } @@ -160,6 +161,9 @@ pub enum Error { /// A `hyper::error::UriError` occurred. #[fail(display = "URI Error")] UriError(url::ParseError), + /// A `http::Error` occurred. + #[fail(display = "http Error")] + HttpError(http::Error), /// A `hyper::Error` occurred. #[fail(display = "Hyper Error")] HyperError(hyper::Error), @@ -168,6 +172,12 @@ pub enum Error { TlsError(native_tls::Error), } +impl From<http::Error> for Error { + fn from(e: http::Error) -> Error { + Error::HttpError(e) + } +} + impl From<hyper::Error> for Error { fn from(e: hyper::Error) -> Error { Error::HyperError(e) |