From 300fff40e3355bc202f1761ff77b594c573ba59b Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sat, 21 Dec 2019 02:52:17 +0300 Subject: [PATCH] refactor(smtp): remove unused SendTimeout Error variant It was used when timeout was set on the whole smtp.send() operation. Now only the operations inside smtp.send() can timeout, and such timeout errors result in SendError, so SendTimeout is unused. --- src/job.rs | 8 -------- src/smtp/send.rs | 9 --------- 2 files changed, 17 deletions(-) diff --git a/src/job.rs b/src/job.rs index d222743c9..621b3f041 100644 --- a/src/job.rs +++ b/src/job.rs @@ -201,14 +201,6 @@ impl Job { println!("{}", String::from_utf8_lossy(&body)); } match task::block_on(smtp.send(context, recipients_list, body, self.job_id)) { - Err(crate::smtp::send::Error::SendTimeout(err)) => { - warn!(context, "SMTP send timed out {:?}", err); - smtp.disconnect(); - self.try_again_later( - TryAgain::AtOnce, - Some("send-timeout".to_string()), - ); - } Err(crate::smtp::send::Error::SendError(err)) => { // Remote error, retry later. warn!(context, "SMTP failed to send: {}", err); diff --git a/src/smtp/send.rs b/src/smtp/send.rs index f39a3b469..4a7093e7f 100644 --- a/src/smtp/send.rs +++ b/src/smtp/send.rs @@ -18,15 +18,6 @@ pub enum Error { #[fail(display = "SMTP has no transport")] NoTransport, - - #[fail(display = "SMTP send timed out")] - SendTimeout(#[cause] async_std::future::TimeoutError), -} - -impl From for Error { - fn from(err: async_std::future::TimeoutError) -> Error { - Error::SendTimeout(err) - } } impl Smtp {