From: Ruben Beltran del Rio Date: Mon, 27 Jan 2025 20:51:04 +0000 (+0100) Subject: Apply clippy X-Git-Tag: 1.1.0~13 X-Git-Url: https://git.r.bdr.sh/rbdr/olden-mail/commitdiff_plain/bbacb35a0771b6abffde6c4ca82c977e24a9b259?hp=8ab8739c55711caa07b8d7540309cb48cc892369 Apply clippy --- diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs index a1ddda2..acbab82 100644 --- a/src/middleware/find_mailboxes_compatibility.rs +++ b/src/middleware/find_mailboxes_compatibility.rs @@ -2,8 +2,8 @@ use log::debug; use super::Middleware; -/// `MailDrop` can't find folders to sync because it implements IMAPv3 and -/// sends FIND MAILBOXES /*, which does not exist in IMAPv4. +/// `MailDrop` can't find folders to sync because it implements `IMAPv3` and +/// sends FIND MAILBOXES /*, which does not exist in `IMAPv4`. /// which is not understood by modern servers. It instead replaces it with /// a LIST command. pub struct FindMailboxesCompatibility { @@ -36,7 +36,7 @@ impl Middleware for FindMailboxesCompatibility { let contains_ok_completed = self .tags .iter() - .any(|tag| command.contains(&format!("{} OK Completed", tag))); + .any(|tag| command.contains(&format!("{tag} OK Completed"))); // We want to only modify responses that were a result of a MAILBOX call. if !contains_ok_completed { @@ -55,14 +55,14 @@ impl Middleware for FindMailboxesCompatibility { if line.starts_with("* LIST") { if let Some(last_slash_pos) = line.rfind('/') { let mailbox_name = line[(last_slash_pos + 1)..].trim(); - return Some(format!("* MAILBOX {}\r", mailbox_name)); + return Some(format!("* MAILBOX {mailbox_name}\r")); } } - return Some(line.to_string()); + Some(line.to_string()) }) .collect(); - return lines.join("\n").into_bytes(); + lines.join("\n").into_bytes() } } diff --git a/src/middleware/mod.rs b/src/middleware/mod.rs index b9685bf..a0bc50f 100644 --- a/src/middleware/mod.rs +++ b/src/middleware/mod.rs @@ -9,7 +9,7 @@ pub trait Middleware: Sync + Send { fn server_message(&mut self, input: &[u8]) -> Vec; } -pub fn get_middleware() -> Arc>>> { +pub fn get() -> Arc>>> { Arc::new(Mutex::new(vec![ Box::new(FindMailboxesCompatibility::new()), ])) diff --git a/src/proxy.rs b/src/proxy.rs index 781ce2e..b8d95cd 100644 --- a/src/proxy.rs +++ b/src/proxy.rs @@ -42,7 +42,7 @@ use std::thread::{sleep, spawn, JoinHandle}; use std::time::Duration; use crate::configuration::Proxy; -use crate::middleware::get_middleware; +use crate::middleware::get as get_middleware; /// A proxy server that listens for plaintext connections and forwards them /// via TLS.