Apply clippy

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index a1ddda20358d23c444e8db6513fb376058fb9937..acbab82ca026d8306472d9922517f70f41ba246c 100644 (file)
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -2,8 +2,8 @@ use log::debug;
 
 use super::Middleware;
 
 
 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 {
 /// 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()
         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 {
 
         // 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();
                 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();
 
             })
             .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 b9685bf8c0d6a02778104db76b1b1a6dfdd543cc..a0bc50f2a5df24613e9e9a10a9102684446cc997 100644 (file)
--- 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<u8>;
 }
 
     fn server_message(&mut self, input: &[u8]) -> Vec<u8>;
 }
 

-pub fn get_middleware() -> Arc<Mutex<Vec<Box<dyn Middleware>>>> {
+pub fn get() -> Arc<Mutex<Vec<Box<dyn Middleware>>>> {

     Arc::new(Mutex::new(vec![
         Box::new(FindMailboxesCompatibility::new()),
     ]))
     Arc::new(Mutex::new(vec![
         Box::new(FindMailboxesCompatibility::new()),
     ]))

diff --git a/src/proxy.rs b/src/proxy.rs
index 781ce2e1b0dbc9297357cada9b6c4a76bfb4c30e..b8d95cd466efb263c3736002f07a67e40e53654a 100644 (file)
--- 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 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.
 
 /// A proxy server that listens for plaintext connections and forwards them
 /// via TLS.