From 8f93d2d6c8d10d07e91738a62e182bc8dfb5aa75 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Fri, 3 Dec 2021 14:57:38 +0100
Subject: [PATCH] Fix clippy and remove borrows

Fix clippy lints and remove unneded borrows when logging or printing
macros.
---
 src/posix/create.rs | 10 +++++-----
 src/posix/info.rs   |  2 +-
 src/posix/send.rs   | 12 ++++++------
 src/posix/unlink.rs |  2 +-
 src/sysv/create.rs  |  2 +-
 src/sysv/info.rs    |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/posix/create.rs b/src/posix/create.rs
index 9a09922..cceabde 100644
--- a/src/posix/create.rs
+++ b/src/posix/create.rs
@@ -40,7 +40,7 @@ impl Create {
         let mq = &mut posixmq::OpenOptions::readonly();
 
         if let Some(m) = &self.mode {
-            mq.mode(u32::from_str_radix(&m, 8)?);
+            mq.mode(u32::from_str_radix(m, 8)?);
         }
 
         mq.max_msg_len(self.msgsize.unwrap_or_else(msgsize_default))
@@ -53,10 +53,10 @@ impl Create {
             let attributes = mq.attributes()?;
 
             info!("Created message queue: {} with attributes msgsize: {}, capacity: {}, current_messages: {}",
-                     &self.queue,
-                     &attributes.max_msg_len,
-                     &attributes.capacity,
-                     &attributes.current_messages);
+                     self.queue,
+                     attributes.max_msg_len,
+                     attributes.capacity,
+                     attributes.current_messages);
         }
 
         Ok(())
diff --git a/src/posix/info.rs b/src/posix/info.rs
index 7ab01e1..2a95f6b 100644
--- a/src/posix/info.rs
+++ b/src/posix/info.rs
@@ -16,7 +16,7 @@ impl Info {
 
         println!(
             "Message queue: {}, msg_max: {}, msgsize_max: {}, current_messages: {}",
-            &self.queue, &attrs.capacity, &attrs.max_msg_len, &attrs.current_messages
+            self.queue, attrs.capacity, attrs.max_msg_len, attrs.current_messages
         );
 
         Ok(())
diff --git a/src/posix/send.rs b/src/posix/send.rs
index fcfad4f..6dd70de 100644
--- a/src/posix/send.rs
+++ b/src/posix/send.rs
@@ -38,24 +38,24 @@ impl Send {
         if let Some(timeout) = &self.timeout {
             mq.open(&self.queue)?.send_timeout(
                 self.priority,
-                &self.msg.as_bytes(),
+                self.msg.as_bytes(),
                 *timeout.parse::<Duration>()?,
             )?;
 
-            info!("Sent message: \"{}\" to queue: {}", &self.msg, &self.queue);
+            info!("Sent message: \"{}\" to queue: {}", self.msg, self.queue);
         } else if let Some(deadline) = &self.deadline {
             mq.open(&self.queue)?.send_deadline(
                 self.priority,
-                &self.msg.as_bytes(),
+                self.msg.as_bytes(),
                 DateTime::parse_from_str(deadline, "%Y-%m-%d %H:%M:%S")?.into(),
             )?;
 
-            info!("Sent message: \"{}\" to queue: {}", &self.msg, &self.queue);
+            info!("Sent message: \"{}\" to queue: {}", self.msg, self.queue);
         } else {
             mq.open(&self.queue)?
-                .send(self.priority, &self.msg.as_bytes())?;
+                .send(self.priority, self.msg.as_bytes())?;
 
-            info!("Sent message: \"{}\" to queue: {}", &self.msg, &self.queue);
+            info!("Sent message: \"{}\" to queue: {}", self.msg, self.queue);
         }
 
         Ok(())
diff --git a/src/posix/unlink.rs b/src/posix/unlink.rs
index cc21287..75a8bd2 100644
--- a/src/posix/unlink.rs
+++ b/src/posix/unlink.rs
@@ -14,7 +14,7 @@ impl Unlink {
     pub fn run(&self) -> Result<()> {
         posixmq::remove_queue(&self.queue)?;
 
-        info!("Removed message queue: {}", &self.queue);
+        info!("Removed message queue: {}", self.queue);
 
         Ok(())
     }
diff --git a/src/sysv/create.rs b/src/sysv/create.rs
index 676cdcb..4adad77 100644
--- a/src/sysv/create.rs
+++ b/src/sysv/create.rs
@@ -19,7 +19,7 @@ impl Create {
         let mut mq = SysvMq::<String>::new();
 
         if let Some(m) = &self.mode {
-            mq.mode(i32::from_str_radix(&m, 8)?);
+            mq.mode(i32::from_str_radix(m, 8)?);
         }
 
         mq.create(self.key)?;
diff --git a/src/sysv/info.rs b/src/sysv/info.rs
index 9bd0420..77d4b3e 100644
--- a/src/sysv/info.rs
+++ b/src/sysv/info.rs
@@ -28,7 +28,7 @@ impl Info {
     pub fn run(&self) -> Result<()> {
         let mut lines = BufReader::new(File::open("/proc/sysvipc/msg")?).lines();
 
-        print_line(&lines.nth(0).unwrap_or(Ok(String::new()))?);
+        print_line(&lines.next().unwrap_or_else(|| Ok(String::new()))?);
 
         for line in lines {
             let line = line?;