From 1452ca2bd1d11faeb7b6d0967b002b965d7be266 Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Wed, 7 Aug 2019 21:26:07 +0100 Subject: [PATCH] remove unnecessary extern crate lines --- src/async_impl/body.rs | 2 +- src/async_impl/client.rs | 2 ++ src/async_impl/decoder.rs | 2 ++ src/async_impl/response.rs | 3 ++- src/body.rs | 2 +- src/client.rs | 2 ++ src/connect.rs | 6 ++--- src/lib.rs | 45 +------------------------------------- 8 files changed, 14 insertions(+), 50 deletions(-) diff --git a/src/async_impl/body.rs b/src/async_impl/body.rs index 012e29a..d6ed1fe 100644 --- a/src/async_impl/body.rs +++ b/src/async_impl/body.rs @@ -1,6 +1,6 @@ use std::fmt; -use futures::{Future, Stream, Poll, Async}; +use futures::{Future, Stream, Poll, Async, try_ready}; use bytes::{Buf, Bytes}; use hyper::body::Payload; use tokio::timer::Delay; diff --git a/src/async_impl/client.rs b/src/async_impl/client.rs index 7c833a8..4011af7 100644 --- a/src/async_impl/client.rs +++ b/src/async_impl/client.rs @@ -28,6 +28,8 @@ use mime; use native_tls::TlsConnector; use tokio::{clock, timer::Delay}; +use log::{debug}; + use super::request::{Request, RequestBuilder}; use super::response::Response; diff --git a/src/async_impl/decoder.rs b/src/async_impl/decoder.rs index 8d4653d..d433a8c 100644 --- a/src/async_impl/decoder.rs +++ b/src/async_impl/decoder.rs @@ -31,6 +31,8 @@ use futures::{Async, Future, Poll, Stream}; use hyper::{HeaderMap}; use hyper::header::{CONTENT_ENCODING, CONTENT_LENGTH, TRANSFER_ENCODING}; +use log::{warn}; + use super::{Body, Chunk}; use crate::error; diff --git a/src/async_impl/response.rs b/src/async_impl/response.rs index 1d6e6f6..118f8a2 100644 --- a/src/async_impl/response.rs +++ b/src/async_impl/response.rs @@ -5,7 +5,7 @@ use std::net::SocketAddr; use std::borrow::Cow; use encoding_rs::{Encoding, UTF_8}; -use futures::{Async, Future, Poll, Stream}; +use futures::{Async, Future, Poll, Stream, try_ready}; use futures::stream::Concat2; use http; use hyper::{HeaderMap, StatusCode, Version}; @@ -16,6 +16,7 @@ use tokio::timer::Delay; use serde::de::DeserializeOwned; use serde_json; use url::Url; +use log::{debug}; use crate::cookie; diff --git a/src/body.rs b/src/body.rs index cfe0468..87e36eb 100644 --- a/src/body.rs +++ b/src/body.rs @@ -3,7 +3,7 @@ use std::fmt; use std::io::{self, Cursor, Read}; use bytes::Bytes; -use futures::Future; +use futures::{Future, try_ready}; use hyper::{self}; use crate::{async_impl}; diff --git a/src/client.rs b/src/client.rs index 4d9cbe3..9b6ea21 100644 --- a/src/client.rs +++ b/src/client.rs @@ -8,6 +8,8 @@ use futures::{Async, Future, Stream}; use futures::future::{self, Either}; use futures::sync::{mpsc, oneshot}; +use log::{trace}; + use crate::request::{Request, RequestBuilder}; use crate::response::Response; use crate::{async_impl, header, Method, IntoUrl, Proxy, RedirectPolicy, wait}; diff --git a/src/connect.rs b/src/connect.rs index 95e8239..0b11ad9 100644 --- a/src/connect.rs +++ b/src/connect.rs @@ -1,9 +1,9 @@ -use futures::Future; +use futures::{Future, try_ready}; use http::uri::Scheme; use hyper::client::connect::{Connect, Connected, Destination}; use tokio_io::{AsyncRead, AsyncWrite}; use tokio_timer::Timeout; - +use log::{trace, debug}; #[cfg(feature = "default-tls")] use native_tls::{TlsConnector, TlsConnectorBuilder}; @@ -488,7 +488,7 @@ mod native_tls_async { use futures::{Poll, Future, Async}; use native_tls::{self, HandshakeError, Error, TlsConnector}; - use tokio_io::{AsyncRead, AsyncWrite}; + use tokio_io::{AsyncRead, AsyncWrite, try_nb}; /// A wrapper around an underlying raw stream which implements the TLS or SSL /// protocol. diff --git a/src/lib.rs b/src/lib.rs index c4402f1..083b464 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -173,52 +173,10 @@ //! [Proxy]: ./struct.Proxy.html //! [cargo-features]: https://doc.rust-lang.org/stable/cargo/reference/manifest.html#the-features-section -extern crate base64; -extern crate bytes; extern crate cookie as cookie_crate; -extern crate cookie_store; -extern crate encoding_rs; -#[macro_use] -extern crate futures; -extern crate http; -extern crate hyper; #[cfg(feature = "hyper-011")] -pub extern crate hyper_old_types as hyper_011; -#[cfg(feature = "default-tls")] -extern crate hyper_tls; -#[macro_use] -extern crate log; -extern crate flate2; -extern crate mime; -extern crate mime_guess; -#[cfg(feature = "default-tls")] -extern crate native_tls; -extern crate serde; -extern crate serde_json; -extern crate serde_urlencoded; -extern crate time; -extern crate tokio; -extern crate tokio_executor; -#[cfg_attr(feature = "default-tls", macro_use)] -extern crate tokio_io; -extern crate tokio_timer; -#[cfg(feature = "trust-dns")] -extern crate trust_dns_resolver; -extern crate url; -extern crate uuid; -#[cfg(feature = "socks")] -extern crate socks; -#[cfg(target_os = "windows")] -extern crate winreg; +pub use hyper_old_types as hyper_011; -#[cfg(feature = "rustls-tls")] -extern crate hyper_rustls; -#[cfg(feature = "rustls-tls")] -extern crate tokio_rustls; -#[cfg(feature = "rustls-tls")] -extern crate webpki_roots; -#[cfg(feature = "rustls-tls")] -extern crate rustls; #[cfg(test)] #[macro_use] extern crate doc_comment; @@ -243,7 +201,6 @@ pub use self::response::Response; #[cfg(feature = "tls")] pub use self::tls::{Certificate, Identity}; - // this module must be first because of the `try_` macro #[macro_use] mod error;