Revert "Upgrade to tokio-native-tls (#65)" (#73)

This reverts commit 7c9adcd.

Author: seanmonstar

Cargo.toml

@@ -18,7 +18,7 @@ bytes = "0.5"
 native-tls = "0.2"
 hyper = { version = "0.13", default-features = false, features = ["tcp"] }
 tokio = { version = "0.2" }
-tokio-native-tls = "0.1"
+tokio-tls = "0.3"
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["io-std", "macros"] }

src/client.rs

@@ -5,7 +5,7 @@ use std::task::{Context, Poll};
 
 use hyper::{client::connect::HttpConnector, service::Service, Uri};
 use tokio::io::{AsyncRead, AsyncWrite};
-use tokio_native_tls::TlsConnector;
+use tokio_tls::TlsConnector;
 
 use crate::stream::MaybeHttpsStream;
 
@@ -65,18 +65,13 @@ impl<T> HttpsConnector<T> {
     pub fn https_only(&mut self, enable: bool) {
         self.force_https = enable;
     }
-
+    
     /// With connector constructor
-    ///
+    /// 
     pub fn new_with_connector(http: T) -> Self {
         native_tls::TlsConnector::new()
             .map(|tls| HttpsConnector::from((http, tls.into())))
-            .unwrap_or_else(|e| {
-                panic!(
-                    "HttpsConnector::new_with_connector(<connector>) failure: {}",
-                    e
-                )
-            })
+            .unwrap_or_else(|e| panic!("HttpsConnector::new_with_connector(<connector>) failure: {}", e))
     }
 }
 
@@ -131,7 +126,9 @@ where
         let fut = async move {
             let tcp = connecting.await.map_err(Into::into)?;
             let maybe = if is_https {
-                let tls = tls.connect(&host, tcp).await?;
+                let tls = tls
+                    .connect(&host, tcp)
+                    .await?;
                 MaybeHttpsStream::Https(tls)
             } else {
                 MaybeHttpsStream::Http(tcp)
@@ -146,7 +143,8 @@ fn err<T>(e: BoxError) -> HttpsConnecting<T> {
     HttpsConnecting(Box::pin(async { Err(e) }))
 }
 
-type BoxedFut<T> = Pin<Box<dyn Future<Output = Result<MaybeHttpsStream<T>, BoxError>> + Send>>;
+type BoxedFut<T> =
+    Pin<Box<dyn Future<Output = Result<MaybeHttpsStream<T>, BoxError>> + Send>>;
 
 /// A Future representing work to connect to a URL, and a TLS handshake.
 pub struct HttpsConnecting<T>(BoxedFut<T>);

src/stream.rs

@@ -6,7 +6,7 @@ use std::task::{Context, Poll};
 use bytes::{Buf, BufMut};
 use hyper::client::connect::{Connected, Connection};
 use tokio::io::{AsyncRead, AsyncWrite};
-pub use tokio_native_tls::TlsStream;
+pub use tokio_tls::TlsStream;
 
 /// A stream that might be protected with TLS.
 pub enum MaybeHttpsStream<T> {
@@ -119,7 +119,7 @@ impl<T: AsyncRead + AsyncWrite + Connection + Unpin> Connection for MaybeHttpsSt
     fn connected(&self) -> Connected {
         match self {
             MaybeHttpsStream::Http(s) => s.connected(),
-            MaybeHttpsStream::Https(s) => s.get_ref().get_ref().get_ref().connected(),
+            MaybeHttpsStream::Https(s) => s.get_ref().connected(),
         }
     }
 }