From f041c00df7c93ce3ec72ea6d159209733499d643 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Fri, 19 Mar 2021 09:03:41 +0100 Subject: [PATCH] Fix a few clippy warnings (#579) --- src/message/mimebody.rs | 2 +- src/transport/smtp/commands.rs | 2 +- src/transport/smtp/error.rs | 3 +-- src/transport/smtp/response.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/message/mimebody.rs b/src/message/mimebody.rs index 3a90a31..a2265d0 100644 --- a/src/message/mimebody.rs +++ b/src/message/mimebody.rs @@ -175,7 +175,7 @@ fn make_boundary() -> String { impl MultiPartKind { fn to_mime>(&self, boundary: Option) -> Mime { - let boundary = boundary.map_or_else(make_boundary, |s| s.into()); + let boundary = boundary.map_or_else(make_boundary, Into::into); format!( "multipart/{}; boundary=\"{}\"{}", diff --git a/src/transport/smtp/commands.rs b/src/transport/smtp/commands.rs index c574013..56e31f9 100644 --- a/src/transport/smtp/commands.rs +++ b/src/transport/smtp/commands.rs @@ -55,7 +55,7 @@ impl Display for Mail { write!( f, "MAIL FROM:<{}>", - self.sender.as_ref().map(|s| s.as_ref()).unwrap_or("") + self.sender.as_ref().map_or("", |s| s.as_ref()) )?; for parameter in &self.parameters { write!(f, " {}", parameter)?; diff --git a/src/transport/smtp/error.rs b/src/transport/smtp/error.rs index d8b79c3..675d7c5 100644 --- a/src/transport/smtp/error.rs +++ b/src/transport/smtp/error.rs @@ -76,8 +76,7 @@ impl Error { /// Returns the status code, if the error was generated from a response. pub fn status(&self) -> Option { match self.inner.kind { - Kind::Transient(code) => Some(code), - Kind::Permanent(code) => Some(code), + Kind::Transient(code) | Kind::Permanent(code) => Some(code), _ => None, } } diff --git a/src/transport/smtp/response.rs b/src/transport/smtp/response.rs index c652e4b..7993803 100644 --- a/src/transport/smtp/response.rs +++ b/src/transport/smtp/response.rs @@ -122,7 +122,7 @@ impl Code { } /// Tells if the response is positive - pub fn is_positive(&self) -> bool { + pub fn is_positive(self) -> bool { matches!( self.severity, Severity::PositiveCompletion | Severity::PositiveIntermediate