From 4a09cba6d2fc0903398761f294b064ee32cfceda Mon Sep 17 00:00:00 2001
From: Jonas Platte <jonas@lumeo.com>
Date: Tue, 13 Oct 2020 22:23:12 +0200
Subject: [PATCH] Update re-exports in sqlx-rt

* async_native_tls::Error is the same as native_tls::Error
* tokio_native_tls is also used for actix (was in the wrong section)
---
 sqlx-rt/src/lib.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/sqlx-rt/src/lib.rs b/sqlx-rt/src/lib.rs
index 811b7b6e..e562374e 100644
--- a/sqlx-rt/src/lib.rs
+++ b/sqlx-rt/src/lib.rs
@@ -16,7 +16,7 @@ compile_error!(
     "only one of 'runtime-actix', 'runtime-async-std' or 'runtime-tokio' features can be enabled"
 );
 
-pub use native_tls;
+pub use native_tls::{self, Error as TlsError};
 
 //
 // Actix *OR* Tokio
@@ -38,6 +38,9 @@ pub use tokio::{
 ))]
 pub use tokio::net::UnixStream;
 
+#[cfg(all(feature = "tokio-native-tls", not(feature = "async-native-tls")))]
+pub use tokio_native_tls::{TlsConnector, TlsStream};
+
 //
 // tokio
 //
@@ -53,12 +56,6 @@ macro_rules! blocking {
     };
 }
 
-#[cfg(all(feature = "tokio-native-tls", not(feature = "async-native-tls")))]
-pub use tokio_native_tls::{TlsConnector, TlsStream};
-
-#[cfg(all(feature = "tokio-native-tls", not(feature = "async-native-tls")))]
-pub use native_tls::Error as TlsError;
-
 //
 // actix
 //
@@ -113,7 +110,7 @@ macro_rules! blocking {
 pub use async_std::os::unix::net::UnixStream;
 
 #[cfg(all(feature = "async-native-tls", not(feature = "tokio-native-tls")))]
-pub use async_native_tls::{Error as TlsError, TlsConnector, TlsStream};
+pub use async_native_tls::{TlsConnector, TlsStream};
 
 #[cfg(all(
     feature = "runtime-async-std",