From 34ac265d603a4c9032018adc4bbd48125a6a87a1 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Mon, 8 Mar 2021 10:38:03 +0100 Subject: [PATCH] Remove deprecated executor methods --- src/lib.rs | 21 --------------------- src/transport/smtp/async_transport.rs | 19 ------------------- src/transport/smtp/mod.rs | 17 +---------------- 3 files changed, 1 insertion(+), 56 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c5ab62f..7a6511c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -92,29 +92,8 @@ pub use crate::transport::smtp::AsyncSmtpTransport; pub use crate::transport::Transport; use crate::{address::Envelope, error::Error}; -#[doc(hidden)] -#[allow(deprecated)] -#[cfg(all(feature = "smtp-transport", feature = "async-std1"))] -pub use crate::transport::smtp::AsyncStd1Connector; #[cfg(feature = "smtp-transport")] pub use crate::transport::smtp::SmtpTransport; -#[doc(hidden)] -#[allow(deprecated)] -#[cfg(all(feature = "smtp-transport", feature = "tokio02"))] -pub use crate::transport::smtp::Tokio02Connector; -#[doc(hidden)] -#[allow(deprecated)] -#[cfg(all(feature = "smtp-transport", feature = "tokio1"))] -pub use crate::transport::smtp::Tokio1Connector; -#[doc(hidden)] -#[cfg(feature = "async-std1")] -pub use crate::transport::AsyncStd1Transport; -#[doc(hidden)] -#[cfg(feature = "tokio02")] -pub use crate::transport::Tokio02Transport; -#[doc(hidden)] -#[cfg(feature = "tokio1")] -pub use crate::transport::Tokio1Transport; #[cfg(test)] #[cfg(feature = "builder")] diff --git a/src/transport/smtp/async_transport.rs b/src/transport/smtp/async_transport.rs index e9c2bf1..fe46d5f 100644 --- a/src/transport/smtp/async_transport.rs +++ b/src/transport/smtp/async_transport.rs @@ -271,22 +271,3 @@ where } } } - -#[doc(hidden)] -#[deprecated(note = "use lettre::Executor instead")] -pub use crate::Executor as AsyncSmtpConnector; - -#[doc(hidden)] -#[deprecated(note = "use lettre::Tokio02Executor instead")] -#[cfg(feature = "tokio02")] -pub type Tokio02Connector = crate::Tokio02Executor; - -#[doc(hidden)] -#[deprecated(note = "use lettre::Tokio1Executor instead")] -#[cfg(feature = "tokio1")] -pub type Tokio1Connector = crate::Tokio1Executor; - -#[doc(hidden)] -#[deprecated(note = "use lettre::AsyncStd1Executor instead")] -#[cfg(feature = "async-std1")] -pub type AsyncStd1Connector = crate::AsyncStd1Executor; diff --git a/src/transport/smtp/mod.rs b/src/transport/smtp/mod.rs index fa3ed33..9e80eef 100644 --- a/src/transport/smtp/mod.rs +++ b/src/transport/smtp/mod.rs @@ -117,9 +117,7 @@ //! ``` #[cfg(any(feature = "tokio02", feature = "tokio1", feature = "async-std1"))] -pub use self::async_transport::{ - AsyncSmtpConnector, AsyncSmtpTransport, AsyncSmtpTransportBuilder, -}; +pub use self::async_transport::{AsyncSmtpTransport, AsyncSmtpTransportBuilder}; #[cfg(feature = "r2d2")] pub use self::pool::PoolConfig; #[cfg(feature = "r2d2")] @@ -139,19 +137,6 @@ use crate::transport::smtp::{ use client::Tls; use std::time::Duration; -#[doc(hidden)] -#[allow(deprecated)] -#[cfg(feature = "async-std1")] -pub use self::async_transport::AsyncStd1Connector; -#[doc(hidden)] -#[allow(deprecated)] -#[cfg(feature = "tokio02")] -pub use self::async_transport::Tokio02Connector; -#[doc(hidden)] -#[allow(deprecated)] -#[cfg(feature = "tokio1")] -pub use self::async_transport::Tokio1Connector; - #[cfg(any(feature = "tokio02", feature = "tokio1", feature = "async-std1"))] mod async_transport; pub mod authentication;