From 31a3be1cba32d32b0b3e9bf0195d830e3385d7bf Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Wed, 9 Sep 2020 09:30:17 +0200 Subject: [PATCH] run cargo fmt --- examples/smtp_starttls.rs | 3 +-- examples/smtp_tls.rs | 3 +-- examples/tokio02_smtp_starttls.rs | 6 ++++-- examples/tokio02_smtp_tls.rs | 6 ++++-- src/transport/smtp/async_transport.rs | 5 +++-- src/transport/smtp/client/async_net.rs | 11 ++++++----- src/transport/smtp/mod.rs | 8 +++++--- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/examples/smtp_starttls.rs b/examples/smtp_starttls.rs index 3e03f52..7a1c7e0 100644 --- a/examples/smtp_starttls.rs +++ b/examples/smtp_starttls.rs @@ -1,5 +1,4 @@ -use lettre::transport::smtp::authentication::Credentials; -use lettre::{Message, SmtpTransport, Transport}; +use lettre::{transport::smtp::authentication::Credentials, Message, SmtpTransport, Transport}; fn main() { tracing_subscriber::fmt::init(); diff --git a/examples/smtp_tls.rs b/examples/smtp_tls.rs index ee87bf4..ca394f0 100644 --- a/examples/smtp_tls.rs +++ b/examples/smtp_tls.rs @@ -1,5 +1,4 @@ -use lettre::transport::smtp::authentication::Credentials; -use lettre::{Message, SmtpTransport, Transport}; +use lettre::{transport::smtp::authentication::Credentials, Message, SmtpTransport, Transport}; fn main() { tracing_subscriber::fmt::init(); diff --git a/examples/tokio02_smtp_starttls.rs b/examples/tokio02_smtp_starttls.rs index 04f6f87..ca11f5a 100644 --- a/examples/tokio02_smtp_starttls.rs +++ b/examples/tokio02_smtp_starttls.rs @@ -3,8 +3,10 @@ // Won't be needed in user's code. use tokio02_crate as tokio; -use lettre::transport::smtp::authentication::Credentials; -use lettre::{AsyncSmtpTransport, Message, Tokio02Connector, Tokio02Transport}; +use lettre::{ + transport::smtp::authentication::Credentials, AsyncSmtpTransport, Message, Tokio02Connector, + Tokio02Transport, +}; #[tokio::main] async fn main() { diff --git a/examples/tokio02_smtp_tls.rs b/examples/tokio02_smtp_tls.rs index 791e848..412f361 100644 --- a/examples/tokio02_smtp_tls.rs +++ b/examples/tokio02_smtp_tls.rs @@ -3,8 +3,10 @@ // Won't be needed in user's code. use tokio02_crate as tokio; -use lettre::transport::smtp::authentication::Credentials; -use lettre::{AsyncSmtpTransport, Message, Tokio02Connector, Tokio02Transport}; +use lettre::{ + transport::smtp::authentication::Credentials, AsyncSmtpTransport, Message, Tokio02Connector, + Tokio02Transport, +}; #[tokio::main] async fn main() { diff --git a/src/transport/smtp/async_transport.rs b/src/transport/smtp/async_transport.rs index 06a6f91..6e1887f 100644 --- a/src/transport/smtp/async_transport.rs +++ b/src/transport/smtp/async_transport.rs @@ -1,9 +1,10 @@ use async_trait::async_trait; -use super::client::AsyncSmtpConnection; #[cfg(feature = "tokio02")] use super::Tls; -use super::{ClientId, Credentials, Error, Mechanism, Response, SmtpInfo}; +use super::{ + client::AsyncSmtpConnection, ClientId, Credentials, Error, Mechanism, Response, SmtpInfo, +}; use crate::{Envelope, Tokio02Transport}; #[allow(missing_debug_implementations)] diff --git a/src/transport/smtp/client/async_net.rs b/src/transport/smtp/client/async_net.rs index 5dcfead..426a9e9 100644 --- a/src/transport/smtp/client/async_net.rs +++ b/src/transport/smtp/client/async_net.rs @@ -1,8 +1,10 @@ -use std::net::{Shutdown, SocketAddr}; -use std::pin::Pin; #[cfg(feature = "tokio02-rustls-tls")] use std::sync::Arc; -use std::task::{Context, Poll}; +use std::{ + net::{Shutdown, SocketAddr}, + pin::Pin, + task::{Context, Poll}, +}; use futures_io::{Error as IoError, ErrorKind, Result as IoResult}; #[cfg(feature = "tokio02")] @@ -159,8 +161,7 @@ impl AsyncNetworkStream { #[cfg(feature = "tokio02-rustls-tls")] return { - use tokio02_rustls::webpki::DNSNameRef; - use tokio02_rustls::TlsConnector; + use tokio02_rustls::{webpki::DNSNameRef, TlsConnector}; let domain = DNSNameRef::try_from_ascii_str(&domain)?; diff --git a/src/transport/smtp/mod.rs b/src/transport/smtp/mod.rs index 00c1505..6a1504d 100644 --- a/src/transport/smtp/mod.rs +++ b/src/transport/smtp/mod.rs @@ -154,14 +154,15 @@ //! ``` //! -use std::time::Duration; - #[cfg(feature = "tokio02")] pub use self::async_transport::{ AsyncSmtpConnector, AsyncSmtpTransport, AsyncSmtpTransportBuilder, Tokio02Connector, }; pub(crate) use self::transport::SmtpClient; -pub use self::transport::{SmtpTransport, SmtpTransportBuilder}; +pub use self::{ + error::Error, + transport::{SmtpTransport, SmtpTransportBuilder}, +}; #[cfg(any(feature = "native-tls", feature = "rustls-tls"))] use crate::transport::smtp::client::TlsParameters; use crate::transport::smtp::{ @@ -171,6 +172,7 @@ use crate::transport::smtp::{ response::Response, }; use client::Tls; +use std::time::Duration; #[cfg(feature = "tokio02")] mod async_transport;