ircd: clean up: cargo clippy

bin/ircd/src/crypto.rs

@@ -61,14 +61,15 @@ pub fn decrypt_target(
         }
 
         let salt_box = chan_info.salt_box.clone();
-        if salt_box.is_some() {
-            let decrypted_target = try_decrypt_message(&salt_box.unwrap(), &privmsg.target);
+
+        if let Some(salt_box) = salt_box {
+            let decrypted_target = try_decrypt_message(&salt_box, &privmsg.target);
             if decrypted_target.is_none() {
                 continue
             }
 
             let target = decrypted_target.unwrap();
-            if chan_name.to_string() == target {
+            if *chan_name == target {
                 privmsg.target = target;
                 return
             }
@@ -77,13 +78,13 @@ pub fn decrypt_target(
 
     for contact in configured_contacts.keys() {
         let salt_box = configured_contacts.get(contact).unwrap();
-        let decrypted_target = try_decrypt_message(&salt_box, &privmsg.target);
+        let decrypted_target = try_decrypt_message(salt_box, &privmsg.target);
         if decrypted_target.is_none() {
             continue
         }
 
         let target = decrypted_target.unwrap();
-        if contact.to_string() == target {
+        if *contact == target {
             privmsg.target = target;
             return
         }

bin/ircd/src/main.rs

@@ -177,7 +177,7 @@ async fn realmain(settings: Args, executor: Arc<Executor<'_>>) -> Result<()> {
         return Ok(())
     }
 
-    let password = settings.password.unwrap_or(String::default());
+    let password = settings.password.unwrap_or_default();
 
     // Pick up channel settings from the TOML configuration
     let cfg_path = get_config_path(settings.config, CONFIG_FILE)?;

bin/ircd/src/privmsg.rs

@@ -35,7 +35,7 @@ impl PrivmsgsBuffer {
     }
 
     pub fn to_vec(&self) -> Vec<Privmsg> {
-        self.0.to_vec().clone()
+        self.0.to_vec()
     }
 }
 

bin/ircd/src/server.rs

@@ -102,7 +102,7 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcServerConnection<C>
         match command.to_uppercase().as_str() {
             "PASS" => {
                 let password = tokens.next().ok_or(Error::MalformedPacket)?;
-                if self.password == password.to_string() {
+                if self.password == *password {
                     self.is_pass_init = true
                 } else {
                     // Close the connection
@@ -215,7 +215,7 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcServerConnection<C>
                 let mut privmsg = Privmsg {
                     id: random_id,
                     nickname: self.nickname.clone(),
-                    target: target.to_string().clone(),
+                    target: target.to_string(),
                     message,
                     timestamp: Timestamp::current_time(),
                 };
@@ -471,16 +471,14 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcServerConnection<C>
 
             self.reply(&msg.to_irc_msg()).await?;
             return Ok(())
-        } else {
-            if self.is_cap_end && self.is_nick_init && self.nickname == msg.target {
-                if self.configured_contacts.contains_key(&msg.target) {
-                    let salt_box = self.configured_contacts.get(&msg.target).unwrap();
-                    decrypt_privmsg(salt_box, &mut msg);
-                    info!("Decrypted received message: {:?}", msg);
-                }
-
-                self.reply(&msg.to_irc_msg()).await?;
+        } else if self.is_cap_end && self.is_nick_init && self.nickname == msg.target {
+            if self.configured_contacts.contains_key(&msg.target) {
+                let salt_box = self.configured_contacts.get(&msg.target).unwrap();
+                decrypt_privmsg(salt_box, &mut msg);
+                info!("Decrypted received message: {:?}", msg);
             }
+
+            self.reply(&msg.to_irc_msg()).await?;
         }
 
         Ok(())