Apply some clippy suggestions

Signed-off-by: Daniel Egger <[email protected]>
axiros · Dec 11, 2024 · 887a1aa · 887a1aa
1 parent 5d6fc6f
commit 887a1aa
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
@@ -14,4 +14,4 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
-      - run: cargo --all -- --check
+      - run: cargo fmt --all -- --check
diff --git a/rusp-bin/src/bin/rusp.rs b/rusp-bin/src/bin/rusp.rs
@@ -381,11 +381,11 @@ enum MsgType {
     /// Generate an USP Get Response Message
     #[command(name = "GetResp")]
     USPGetResp {
-        /// A JSON array of Strings resembling the result data for the GetResp operation
+        /// A JSON array of Strings resembling the result data for the `GetResp` operation
         #[arg(num_args(1..))]
         result: Vec<String>,
     },
-    /// Generate an USP GetInstances Request Message
+    /// Generate an USP `GetInstances` Request Message
     #[command(name = "GetInstances")]
     USPGetInstances {
         /// Only return the first level of recursive structures?
@@ -397,7 +397,7 @@ enum MsgType {
         #[arg(num_args(1..))]
         obj_paths: Vec<String>,
     },
-    /// Generate an USP GetSupportedDM Request Message
+    /// Generate an USP `GetSupportedDM` Request Message
     #[command(name = "GetSupportedDM")]
     USPGetSupportedDM {
         /// Only return the first level of recursive structures?
@@ -421,7 +421,7 @@ enum MsgType {
         #[arg(num_args(1..))]
         paths: Vec<String>,
     },
-    /// Generate an USP GetSupportedProtocol Request Message
+    /// Generate an USP `GetSupportedProtocol` Request Message
     #[command(name = "GetSupportedProtocol")]
     USPGetSupportedProtocol {
         /// Controller Supported Protocol Version

diff --git a/rusp-lib/src/usp_builder.rs b/rusp-lib/src/usp_builder.rs
@@ -563,7 +563,7 @@ mod tests {
         ";
 
         let rmsg = try_decode_msg(data).expect("deserialisation failed");
-        assert_eq!(msg, rmsg)
+        assert_eq!(msg, rmsg);
     }
 
     #[test]
@@ -589,7 +589,7 @@ mod tests {
         ";
 
         let rmsg = try_decode_msg(data).expect("deserialisation failed");
-        assert_eq!(msg, rmsg)
+        assert_eq!(msg, rmsg);
     }
 
     #[test]
@@ -686,7 +686,7 @@ mod tests {
         let data = b"\n\x1c\n\x18CXOue8V6Pg/hYC4bKfO8rw==\x10\x12\x12\t\x12\x07J\x05\n\x031.1";
         let rmsg = try_decode_msg(data).expect("deserialisation failed");
 
-        assert_eq!(msg, rmsg)
+        assert_eq!(msg, rmsg);
     }
 
     #[test]

diff --git a/rusp-lib/src/usp_builder/notify.rs b/rusp-lib/src/usp_builder/notify.rs
@@ -208,12 +208,7 @@ impl NotifyBuilder {
                 product_class,
                 serial_number,
                 agent_supported_protocol_versions,
-            } => on_board_req(OnBoardRequest {
-                agent_supported_protocol_versions,
-                oui,
-                product_class,
-                serial_number,
-            }),
+            } => on_board_req(OnBoardRequest { oui, product_class, serial_number, agent_supported_protocol_versions }),
             NotifyType::ValueChange {
                 param_path,
                 param_value,

diff --git a/rusp-lib/src/usp_encoder.rs b/rusp-lib/src/usp_encoder.rs
@@ -57,7 +57,7 @@ pub fn try_encode_msg(msg: &Msg) -> Result<Vec<u8>> {
 
 impl SessionContextRecord {
     /// Creates a new [`SessionContextRecord`] with an unfragmented payload
-    pub fn new_unfragmented(
+    #[must_use] pub fn new_unfragmented(
         session_id: u64,
         sequence_id: u64,
         expected_id: u64,
@@ -195,7 +195,7 @@ impl Record {
         let mut out = String::new();
 
         write!(out, "\"")?;
-        for i in data.iter() {
+        for i in &data {
             if check_printable(*i) {
                 write!(out, "{}", char::from(*i))?;
             } else {
@@ -398,7 +398,7 @@ impl Msg {
         let mut out = String::new();
 
         write!(out, "\"")?;
-        for i in data.iter() {
+        for i in &data {
             if check_printable(*i) {
                 write!(out, "{}", char::from(*i))?;
             } else {

diff --git a/rusp-lib/tests/test_json.rs b/rusp-lib/tests/test_json.rs
@@ -20,7 +20,7 @@ mod tests {
         let record = Record::from_reader(&mut reader, &bytes).expect("Cannot read Record");
 
         let serialized = serde_json::to_string_pretty(&record).unwrap();
-        println!("serialized = {}", serialized);
+        println!("serialized = {serialized}");
         assert_eq!(
             serialized,
             r#"{
@@ -189,7 +189,7 @@ mod tests {
         let record = Record::from_reader(&mut reader, &bytes).expect("Cannot read Record");
 
         let serialized = serde_json::to_string_pretty(&record).unwrap();
-        println!("serialized = {}", serialized);
+        println!("serialized = {serialized}");
         assert_eq!(
             serialized,
             r#"{