From b583aff36cb2b2e95998387e7873fed11f62a251 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Thu, 1 May 2025 19:42:30 +0200 Subject: [PATCH] Move things --- src/transport/smtp/client/mod.rs | 6 +++--- src/transport/smtp/client/tls/boring_tls.rs | 1 + src/transport/smtp/client/{tls.rs => tls/deprecated.rs} | 0 src/transport/smtp/client/tls/mod.rs | 7 +++++++ src/transport/smtp/client/tls/native_tls.rs | 1 + src/transport/smtp/client/tls/rustls.rs | 1 + 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/transport/smtp/client/tls/boring_tls.rs rename src/transport/smtp/client/{tls.rs => tls/deprecated.rs} (100%) create mode 100644 src/transport/smtp/client/tls/mod.rs create mode 100644 src/transport/smtp/client/tls/native_tls.rs create mode 100644 src/transport/smtp/client/tls/rustls.rs diff --git a/src/transport/smtp/client/mod.rs b/src/transport/smtp/client/mod.rs index 8016c28..e245cf2 100644 --- a/src/transport/smtp/client/mod.rs +++ b/src/transport/smtp/client/mod.rs @@ -34,12 +34,12 @@ pub use self::async_net::AsyncNetworkStream; pub use self::async_net::AsyncTokioStream; use self::net::NetworkStream; #[cfg(any(feature = "native-tls", feature = "rustls", feature = "boring-tls"))] -pub(super) use self::tls::InnerTlsParameters; +pub(super) use self::tls::deprecated::InnerTlsParameters; #[cfg(any(feature = "native-tls", feature = "rustls", feature = "boring-tls"))] -pub use self::tls::TlsVersion; +pub use self::tls::deprecated::TlsVersion; pub use self::{ connection::SmtpConnection, - tls::{Certificate, Identity, Tls, TlsParameters, TlsParametersBuilder}, + tls::deprecated::{Certificate, Identity, Tls, TlsParameters, TlsParametersBuilder}, }; #[cfg(any(feature = "tokio1", feature = "async-std1"))] diff --git a/src/transport/smtp/client/tls/boring_tls.rs b/src/transport/smtp/client/tls/boring_tls.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/transport/smtp/client/tls/boring_tls.rs @@ -0,0 +1 @@ + diff --git a/src/transport/smtp/client/tls.rs b/src/transport/smtp/client/tls/deprecated.rs similarity index 100% rename from src/transport/smtp/client/tls.rs rename to src/transport/smtp/client/tls/deprecated.rs diff --git a/src/transport/smtp/client/tls/mod.rs b/src/transport/smtp/client/tls/mod.rs new file mode 100644 index 0000000..a520474 --- /dev/null +++ b/src/transport/smtp/client/tls/mod.rs @@ -0,0 +1,7 @@ +#[cfg(feature = "boring-tls")] +mod boring_tls; +pub(super) mod deprecated; +#[cfg(feature = "native-tls")] +mod native_tls; +#[cfg(feature = "rustls")] +mod rustls; diff --git a/src/transport/smtp/client/tls/native_tls.rs b/src/transport/smtp/client/tls/native_tls.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/transport/smtp/client/tls/native_tls.rs @@ -0,0 +1 @@ + diff --git a/src/transport/smtp/client/tls/rustls.rs b/src/transport/smtp/client/tls/rustls.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/transport/smtp/client/tls/rustls.rs @@ -0,0 +1 @@ +