chore(tls): streamline conn module type re-exports

Author: 0x676e67

src/client/http/connect/conn.rs

@@ -16,7 +16,7 @@ use tokio_boring2::SslStream;
 use super::{AsyncConnWithInfo, TlsInfoFactory};
 use crate::{
     core::client::connect::{Connected, Connection},
-    tls::{MaybeHttpsStream, TlsInfo},
+    tls::{TlsInfo, conn::MaybeHttpsStream},
 };
 
 pin_project! {

src/client/http/connect/connector.rs

@@ -33,8 +33,10 @@ use crate::{
     error::{BoxError, TimedOut, map_timeout_to_connector_error},
     proxy::{Intercepted, Matcher as ProxyMatcher},
     tls::{
-        EstablishedConn, HttpsConnector, MaybeHttpsStream, TlsConnector, TlsConnectorBuilder,
         TlsOptions,
+        conn::{
+            EstablishedConn, HttpsConnector, MaybeHttpsStream, TlsConnector, TlsConnectorBuilder,
+        },
     },
 };
 

src/client/http/connect/tls_info.rs

@@ -3,7 +3,7 @@ use tokio::net::TcpStream;
 use tokio::net::UnixStream;
 use tokio_boring2::SslStream;
 
-use crate::tls::{MaybeHttpsStream, TlsInfo};
+use crate::tls::{TlsInfo, conn::MaybeHttpsStream};
 
 /// A trait for extracting TLS information from a connection.
 ///

src/client/http/mod.rs

@@ -70,8 +70,8 @@ use crate::{
     proxy::Matcher as ProxyMatcher,
     redirect::{self, FollowRedirectPolicy, Policy as RedirectPolicy},
     tls::{
-        AlpnProtocol, CertStore, Identity, KeyLogPolicy, TlsConnectorBuilder, TlsOptions,
-        TlsVersion,
+        AlpnProtocol, CertStore, Identity, KeyLogPolicy, TlsOptions, TlsVersion,
+        conn::TlsConnectorBuilder,
     },
 };
 

src/tls/mod.rs

@@ -4,16 +4,13 @@
 //!
 //! - Various parts of TLS can also be configured or even disabled on the `ClientBuilder`.
 
-mod conn;
+pub(crate) mod conn;
 mod keylog;
 mod options;
 mod x509;
 
 pub use boring2::ssl::{CertificateCompressionAlgorithm, ExtensionType};
 
-pub(crate) use self::conn::{
-    EstablishedConn, HttpsConnector, MaybeHttpsStream, TlsConnector, TlsConnectorBuilder,
-};
 pub use self::{
     keylog::KeyLogPolicy,
     options::{TlsOptions, TlsOptionsBuilder},