misc clippy fixes

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/proxmox-http/src/websocket/mod.rs b/proxmox-http/src/websocket/mod.rs
index a9d21dfc2fc0650e6ffb52e3abaacaf8ff666467..cb17776fc5717cc605d24008ca4de199926c9c52 100644 (file)
--- a/proxmox-http/src/websocket/mod.rs
+++ b/proxmox-http/src/websocket/mod.rs
@@ -742,7 +742,7 @@ impl WebSocket {
     async fn copy_to_websocket<R, W>(
         &self,
         mut reader: &mut R,
-        mut writer: &mut WebSocketWriter<W>,
+        writer: &mut WebSocketWriter<W>,
         receiver: &mut mpsc::UnboundedReceiver<WebSocketReadResult>,
     ) -> Result<bool, Error>
     where
@@ -757,7 +757,7 @@ impl WebSocket {
                     res = buf.read_from_async(&mut reader).fuse() => res?,
                     res = receiver.recv().fuse() => {
                         let res = res.ok_or_else(|| format_err!("control channel closed"))?;
-                        match self.handle_channel_message(res, &mut writer).await? {
+                        match self.handle_channel_message(res, writer).await? {
                             OpCode::Close => return Ok(true),
                             _ => { continue; },
                         }

diff --git a/proxmox-metrics/src/influxdb/utils.rs b/proxmox-metrics/src/influxdb/utils.rs
index 3507e61b16432581b4e66994b8858a858290f8a3..05e304f41a0e6809482f9656a94f89a9470b314e 100644 (file)
--- a/proxmox-metrics/src/influxdb/utils.rs
+++ b/proxmox-metrics/src/influxdb/utils.rs
@@ -29,7 +29,7 @@ pub(crate) fn format_influxdb_line(data: &MetricsData) -> Result<String, Error>
             line.push(',');
         }
         first = false;
-        write!(line, "{}={}", escape_key(key), value.to_string())?;
+        write!(line, "{}={}", escape_key(key), value)?;
     }
 
     // nanosecond precision

diff --git a/proxmox-serde/src/lib.rs b/proxmox-serde/src/lib.rs
index b9aa787ca40bdfceb1dc41f6da78a188d0f00b63..79c7401ebd2569e7926ae8d295fe728e4d044b8e 100644 (file)
--- a/proxmox-serde/src/lib.rs
+++ b/proxmox-serde/src/lib.rs
@@ -123,12 +123,12 @@ pub mod string_as_base64 {
         use serde::de::Error;
 
         let bytes = base64::decode(&string).map_err(|err| {
-            let msg = format!("base64 decode: {}", err.to_string());
+            let msg = format!("base64 decode: {}", err);
             Error::custom(msg)
         })?;
 
         String::from_utf8(bytes).map_err(|err| {
-            let msg = format!("utf8 decode: {}", err.to_string());
+            let msg = format!("utf8 decode: {}", err);
             Error::custom(msg)
         })
     }

diff --git a/proxmox-shared-memory/tests/raw_shared_mutex.rs b/proxmox-shared-memory/tests/raw_shared_mutex.rs
index fc46a8db1bdcc7099d49a06cd7c3b4ef14ee82e1..204cbc87a3e71c993c7ed78a04e60180389257a2 100644 (file)
--- a/proxmox-shared-memory/tests/raw_shared_mutex.rs
+++ b/proxmox-shared-memory/tests/raw_shared_mutex.rs
@@ -100,7 +100,7 @@ fn create_test_dir<T: Init>(filename: &str) -> Option<PathBuf> {
 }
 #[test]
 fn test_shared_memory_mutex() -> Result<(), Error> {
-    let path = match create_test_dir::<SingleMutexData>(&"data1.shm") {
+    let path = match create_test_dir::<SingleMutexData>("data1.shm") {
         None => { return Ok(()); }, // no O_TMPFILE support, can't run test
         Some(path) => path,
     };
@@ -136,7 +136,7 @@ fn test_shared_memory_mutex() -> Result<(), Error> {
 
 #[test]
 fn test_shared_memory_multi_mutex() -> Result<(), Error> {
-    let path = match create_test_dir::<SingleMutexData>(&"data2.shm") {
+    let path = match create_test_dir::<SingleMutexData>("data2.shm") {
         None => { return Ok(()); }, // no O_TMPFILE support, can't run test
         Some(path) => path,
     };

diff --git a/proxmox-sys/src/linux/procfs/mountinfo.rs b/proxmox-sys/src/linux/procfs/mountinfo.rs
index 48ec112855b38a05d840b144d5c78428000a205f..2848425c6bea1929574729fb85b2b136049f88b9 100644 (file)
--- a/proxmox-sys/src/linux/procfs/mountinfo.rs
+++ b/proxmox-sys/src/linux/procfs/mountinfo.rs
@@ -312,7 +312,7 @@ fn test_entry() {
     );
     assert_eq!(entry.fs_type, "cgroup");
     assert_eq!(
-        entry.mount_source.as_ref().map(|s| s.as_os_str()),
+        entry.mount_source.as_deref(),
         Some(OsStr::new("cgroup"))
     );
     assert_eq!(entry.super_options, "rw,blkio");
@@ -341,7 +341,7 @@ fn test_entry() {
     );
     assert_eq!(entry.fs_type, "autofs");
     assert_eq!(
-        entry.mount_source.as_ref().map(|s| s.as_os_str()),
+        entry.mount_source.as_deref(),
         Some(OsStr::new("systemd-1"))
     );
     assert_eq!(

diff --git a/proxmox-tfa/src/totp.rs b/proxmox-tfa/src/totp.rs
index 1e342c40db4e29a0100b173e6878451e2ee20532..b0c417fcea6e0b69d7bd03549afd893538919f67 100644 (file)
--- a/proxmox-tfa/src/totp.rs
+++ b/proxmox-tfa/src/totp.rs
@@ -525,7 +525,7 @@ fn test_otp() {
     assert_eq!(parsed, hotp);
     assert_eq!(parsed.issuer, None);
     assert_eq!(
-        parsed.account_name.as_ref().map(String::as_str),
+        parsed.account_name.as_deref(),
         Some("My Account")
     );
 
@@ -558,11 +558,11 @@ fn test_otp() {
     let parsed: Totp = uri.parse().expect("failed to parse otp uri");
     assert_eq!(parsed, totp);
     assert_eq!(
-        parsed.issuer.as_ref().map(String::as_str),
+        parsed.issuer.as_deref(),
         Some("An Issuer")
     );
     assert_eq!(
-        parsed.account_name.as_ref().map(String::as_str),
+        parsed.account_name.as_deref(),
         Some("The Account Name")
     );
 }

diff --git a/proxmox-tfa/src/u2f.rs b/proxmox-tfa/src/u2f.rs
index 732b95c5a9432b64d0d4431699bb94b87d8ff187..f543c63fbf8ae3c455c4c8d617ab49b54ad91a5a 100644 (file)
--- a/proxmox-tfa/src/u2f.rs
+++ b/proxmox-tfa/src/u2f.rs
@@ -522,7 +522,7 @@ mod test {
         }
 
         let ts: TestChallenge =
-            serde_json::from_str(&data).expect("failed to parse json test data");
+            serde_json::from_str(data).expect("failed to parse json test data");
 
         let context = super::U2f::new(TEST_APPID.to_string(), TEST_APPID.to_string());
         let res = context
@@ -546,7 +546,7 @@ mod test {
         }
 
         let ts: TestChallenge =
-            serde_json::from_str(&data).expect("failed to parse json test data");
+            serde_json::from_str(data).expect("failed to parse json test data");
 
         let context = super::U2f::new(TEST_APPID.to_string(), TEST_APPID.to_string());
         let res = context