From c2ceecc3c51f26d7d7f0f7550f6f996bd2432043 Mon Sep 17 00:00:00 2001 From: Anthony Date: Sun, 14 Jun 2026 22:06:50 +0200 Subject: [PATCH] style: rustfmt the server, parsing and APPEND changes --- crates/bridge/src/imap/mod.rs | 3 ++- crates/bridge/src/imap/session.rs | 5 ++++- crates/bridge/src/mail/parser.rs | 5 ++++- crates/bridge/src/smtp/mod.rs | 18 +++++++++++++----- crates/bridge/src/sync.rs | 10 ++++++++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/crates/bridge/src/imap/mod.rs b/crates/bridge/src/imap/mod.rs index 62d784d..17af143 100644 --- a/crates/bridge/src/imap/mod.rs +++ b/crates/bridge/src/imap/mod.rs @@ -40,7 +40,8 @@ pub async fn serve( { Ok(Ok(tls_stream)) => { if let Err(e) = - handle_connection(tls_stream, store, backend, local_store, pw_hash).await + handle_connection(tls_stream, store, backend, local_store, pw_hash) + .await { error!("IMAP connection error: {}", e); } diff --git a/crates/bridge/src/imap/session.rs b/crates/bridge/src/imap/session.rs index 31455e0..39814c6 100644 --- a/crates/bridge/src/imap/session.rs +++ b/crates/bridge/src/imap/session.rs @@ -1115,7 +1115,10 @@ fn append_first_token(args: &str) -> Option { fn append_literal_size(args: &str) -> Option { let open = args.rfind('{')?; let close = args[open..].find('}')? + open; - args[open + 1..close].trim_end_matches('+').parse::().ok() + args[open + 1..close] + .trim_end_matches('+') + .parse::() + .ok() } #[cfg(test)] diff --git a/crates/bridge/src/mail/parser.rs b/crates/bridge/src/mail/parser.rs index e62f71a..2388c44 100644 --- a/crates/bridge/src/mail/parser.rs +++ b/crates/bridge/src/mail/parser.rs @@ -512,7 +512,10 @@ mod tests { #[test] fn qp_non_utf8_byte_is_decoded_not_echoed() { let out = decode_quoted_printable("caf=E9"); - assert!(!out.contains("=E9"), "QP source must be decoded, not echoed"); + assert!( + !out.contains("=E9"), + "QP source must be decoded, not echoed" + ); assert!(out.starts_with("caf"), "got {out:?}"); } diff --git a/crates/bridge/src/smtp/mod.rs b/crates/bridge/src/smtp/mod.rs index 4bf1758..5b9c846 100644 --- a/crates/bridge/src/smtp/mod.rs +++ b/crates/bridge/src/smtp/mod.rs @@ -143,7 +143,8 @@ pub async fn serve( { Ok(Ok(tls_stream)) => { if let Err(e) = - handle_connection(tls_stream, tuta, pw_hash, SmtpLimits::default()).await + handle_connection(tls_stream, tuta, pw_hash, SmtpLimits::default()) + .await { error!("SMTP connection error: {}", e); } @@ -509,7 +510,10 @@ mod tests { assert!(size_param_exceeds("MAIL FROM: size=30000000", max)); // case-insensitive assert!(!size_param_exceeds("MAIL FROM: SIZE=1000", max)); assert!(!size_param_exceeds("MAIL FROM:", max)); // no SIZE param - assert!(!size_param_exceeds("MAIL FROM: SIZE=notanumber", max)); + assert!(!size_param_exceeds( + "MAIL FROM: SIZE=notanumber", + max + )); } #[tokio::test] @@ -672,9 +676,13 @@ mod tests { let backend = Arc::new(CountingBackend::default()); let b = backend.clone(); let h = tokio::spawn(async move { - let _ = - handle_connection(server, b as Arc, None, SmtpLimits::default()) - .await; + let _ = handle_connection( + server, + b as Arc, + None, + SmtpLimits::default(), + ) + .await; }); run_to_data(&mut client).await; diff --git a/crates/bridge/src/sync.rs b/crates/bridge/src/sync.rs index 5f90015..6df1deb 100644 --- a/crates/bridge/src/sync.rs +++ b/crates/bridge/src/sync.rs @@ -458,7 +458,10 @@ pub async fn run_syncer( Ok(Some(rfc)) => { let text = extract_body_text(&rfc); if let Err(e) = ls.index_body(&meta.element_id, &text) { - warn!("FTS backfill failed for {}: {e}", meta.element_id); + warn!( + "FTS backfill failed for {}: {e}", + meta.element_id + ); ok = false; } else { indexed += 1; @@ -466,7 +469,10 @@ pub async fn run_syncer( } Ok(None) => {} Err(e) => { - warn!("FTS backfill read failed for {}: {e}", meta.element_id); + warn!( + "FTS backfill read failed for {}: {e}", + meta.element_id + ); ok = false; } }