Skip to content

refactor: do not evaluate smtp_write! argument twice #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
link2xt merged 1 commit into from
Jul 10, 2026
Merged

refactor: do not evaluate smtp_write! argument twice #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/smtp_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,10 @@ where

macro_rules! smtp_write {
($command: expr) => {
log::trace!("Sending: {}", String::from_utf8_lossy($command));
buf_stream.write_all($command).await?;
let command = $command;
let bytes: &[u8] = command.as_ref();
log::trace!("Sending: {}", String::from_utf8_lossy(bytes));
buf_stream.write_all(bytes).await?;
buf_stream.flush().await?;
};
}
Expand Down Expand Up @@ -375,7 +377,7 @@ where
smtp_read!("initial greeting", "220")?;

smtp_cmd!(
format!("{greeting} {}\r\n", { config.client_hostname }).as_bytes(),
format!("{greeting} {}\r\n", { config.client_hostname }),
greeting,
"250"
)?;
Expand Down Expand Up @@ -421,22 +423,22 @@ where
buf_stream = BufStream::new(smtp_stream);

smtp_cmd!(
format!("EHLO {}\r\n", config.client_hostname).as_bytes(),
format!("EHLO {}\r\n", config.client_hostname),
"EHLO after STARTTLS",
"250"
)?;
}
}

// MAIL FROM
smtp_write!(format!("MAIL FROM:<{}>\r\n", envelope.mail_from).as_bytes());
smtp_write!(format!("MAIL FROM:<{}>\r\n", envelope.mail_from));
if !pipelining {
smtp_read!("MAIL FROM", "250")?;
}

// RCPT TO
for rcpt in &envelope.rcpt_to {
smtp_write!(format!("RCPT TO:<{}>\r\n", rcpt).as_bytes());
smtp_write!(format!("RCPT TO:<{}>\r\n", rcpt));
if !pipelining {
smtp_read!("RCPT TO", "250")?;
}
Expand Down