Use map_err

src/smtp.rs

@@ -166,27 +166,22 @@ impl Smtp {
             .join(",");
 
         if let Some(ref mut transport) = self.transport {
-            let envelope = match Envelope::new(self.from.clone(), recipients) {
+            let envelope =
-                Ok(envelope) => envelope,
+                Envelope::new(self.from.clone(), recipients).map_err(SmtpError::EnvelopeError)?;
-                Err(e) => return Err(SmtpError::EnvelopeError(e)),
-            };
             let mail = SendableEmail::new(
                 envelope,
                 format!("{}", job_id), // only used for internal logging
                 message,
             );
 
-            match transport.send(mail) {
+            transport.send(mail).map_err(SmtpError::SendError)?;
-                Ok(_) => {
+
-                    context.call_cb(Event::SmtpMessageSent(format!(
+            context.call_cb(Event::SmtpMessageSent(format!(
-                        "Message len={} was smtp-sent to {}",
+                "Message len={} was smtp-sent to {}",
-                        message_len, recipients_display
+                message_len, recipients_display
-                    )));
+            )));
-                    self.transport_connected = true;
+            self.transport_connected = true;
-                    Ok(())
+            Ok(())
-                }
-                Err(err) => return Err(SmtpError::SendError(err)),
-            }
         } else {
             warn!(
                 context,