itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-28 11:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update re-exports in sqlx-rt

Browse Source 
* async_native_tls::Error is the same as native_tls::Error
* tokio_native_tls is also used for actix (was in the wrong section)
This commit is contained in:
Jonas Platte 2020-10-13 22:23:12 +02:00 committed by Austin Bonander
parent e1662e42e1
commit 4a09cba6d2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sqlx-rt/src/lib.rs
View File

@ -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",