Merge pull request #24 from Johannesd3/master

Use futures_util directly instead of futures

Author: tafia

Cargo.toml

@@ -19,7 +19,7 @@ hyper = { version = "0.14", features = ["client"] }
 
 tower-service = "0.3"
 http = "0.2"
-futures = "0.3"
+futures-util = { version = "0.3", default-features = false }
 bytes = "1.0"
 hyper-tls = { version = "0.5.0", optional = true }
 tokio-native-tls = { version = "0.3.0", optional = true }

src/lib.rs

@@ -4,7 +4,7 @@
 //! ```rust,no_run
 //! use hyper::{Client, Request, Uri, body::HttpBody};
 //! use hyper::client::HttpConnector;
-//! use futures::{TryFutureExt, TryStreamExt};
+//! use futures_util::{TryFutureExt, TryStreamExt};
 //! use hyper_proxy::{Proxy, ProxyConnector, Intercept};
 //! use headers::Authorization;
 //! use std::error::Error;
@@ -60,7 +60,7 @@ mod tunnel;
 use http::header::{HeaderMap, HeaderName, HeaderValue};
 use hyper::{service::Service, Uri};
 
-use futures::future::TryFutureExt;
+use futures_util::future::TryFutureExt;
 use std::{fmt, io, sync::Arc};
 use std::{
     future::Future,
@@ -509,7 +509,7 @@ where
                             .map_ok(ProxyStream::Regular)
                             .map_err(|err| io_err(err.into())),
                     ),
-                    Err(err) => Box::pin(futures::future::err(io_err(err))),
+                    Err(err) => Box::pin(futures_util::future::err(io_err(err))),
                 }
             }
         } else {

src/tunnel.rs

@@ -89,7 +89,7 @@ impl<S: AsyncRead + AsyncWrite + Unpin> Future for Tunnel<S> {
         loop {
             if let TunnelState::Writing = &this.state {
                 let fut = this.stream.as_mut().unwrap().write_buf(&mut this.buf);
-                futures::pin_mut!(fut);
+                futures_util::pin_mut!(fut);
                 let n = try_ready!(fut.poll(ctx));
 
                 if !this.buf.has_remaining() {
@@ -100,7 +100,7 @@ impl<S: AsyncRead + AsyncWrite + Unpin> Future for Tunnel<S> {
                 }
             } else {
                 let fut = this.stream.as_mut().unwrap().read_buf(&mut this.buf);
-                futures::pin_mut!(fut);
+                futures_util::pin_mut!(fut);
                 let n = try_ready!(fut.poll(ctx));
 
                 if n == 0 {
@@ -130,7 +130,7 @@ impl<S: AsyncRead + AsyncWrite + Unpin> Future for Tunnel<S> {
 #[cfg(test)]
 mod tests {
     use super::{HeaderMap, Tunnel};
-    use futures::future::TryFutureExt;
+    use futures_util::future::TryFutureExt;
     use std::io::{Read, Write};
     use std::net::TcpListener;
     use std::thread;