simpler error type

Author: link2xt

src/smtp.rs

@@ -263,7 +263,7 @@ async fn smtp_send(
     smtp.last_send_error = send_result.as_ref().err().map(|e| e.to_string());
 
     let status = match send_result {
-        Err(crate::smtp::send::Error::SmtpSend(err)) => {
+        Err(send::Error::SmtpSend(err)) => {
             // Remote error, retry later.
             info!(context, "SMTP failed to send: {:?}.", &err);
 
@@ -345,13 +345,7 @@ async fn smtp_send(
 
             res
         }
-        Err(crate::smtp::send::Error::Envelope(err)) => {
-            // Local error, job is invalid, do not retry.
-            smtp.disconnect();
-            warn!(context, "SMTP job is invalid: {err:#}.");
-            SendResult::Failure(err)
-        }
-        Err(crate::smtp::send::Error::Other(err)) => {
+        Err(send::Error::Other(err)) => {
             // Local error, job is invalid, do not retry.
             smtp.disconnect();
             warn!(context, "Unable to load SMTP job: {err:#}.");

src/smtp/send.rs

@@ -1,5 +1,6 @@
 //! # SMTP message sending
 
+use anyhow::Context as _;
 use async_smtp::{EmailAddress, Envelope, SendableEmail};
 
 use super::Connection;
@@ -11,8 +12,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("Envelope error: {}", _0)]
-    Envelope(anyhow::Error),
     #[error("Send error: {}", _0)]
     SmtpSend(async_smtp::error::Error),
     #[error("{}", _0)]
@@ -35,8 +34,8 @@ impl Connection {
             context.ratelimit.write().await.send();
         }
 
-        let envelope =
-            Envelope::new(Some(self.from.clone()), recipients.to_vec()).map_err(Error::Envelope)?;
+        let envelope = Envelope::new(Some(self.from.clone()), recipients.to_vec())
+            .context("Envelope error")?;
         let mail = SendableEmail::new(envelope, message);
 
         self.transport.send(mail).await.map_err(Error::SmtpSend)?;