chore: fix clippy warnings

namib-project · Jan 22, 2024 · fd2bd09 · fd2bd09
1 parent 05eb21d
commit fd2bd09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/helper.rs b/src/helper.rs
@@ -51,12 +51,13 @@ pub fn get_current_ruleset_raw(
         }
         None => default_args.to_vec(),
     };
+    let program = nft_cmd.get_program().to_str().unwrap().to_string();
     let process_result = nft_cmd
         .args(args)
         .output()
         .map_err(|e| NftablesError::NftExecution {
             inner: e,
-            program: format!("{}", nft_cmd.get_program().to_str().unwrap()),
+            program: program.clone(),
         })?;
 
     let stdout = read_output(&nft_cmd, process_result.stdout)?;
@@ -65,7 +66,7 @@ pub fn get_current_ruleset_raw(
         let stderr = read_output(&nft_cmd, process_result.stderr)?;
 
         return Err(NftablesError::NftFailed {
-            program: format!("{}", nft_cmd.get_program().to_str().unwrap()),
+            program,
             hint: "getting the current ruleset".to_string(),
             stdout,
             stderr,
@@ -97,21 +98,22 @@ pub fn apply_ruleset_raw(
         }
         None => default_args.to_vec(),
     };
+    let program = nft_cmd.get_program().to_str().unwrap().to_string();
     let mut process = nft_cmd
         .args(args)
         .stdin(Stdio::piped())
         .stdout(Stdio::piped())
         .spawn()
         .map_err(|e| NftablesError::NftExecution {
-            program: format!("{}", nft_cmd.get_program().to_str().unwrap()),
+            program: program.clone(),
             inner: e,
         })?;
 
     let mut stdin = process.stdin.take().unwrap();
     stdin
         .write_all(payload.as_bytes())
         .map_err(|e| NftablesError::NftExecution {
-            program: format!("{}", nft_cmd.get_program().to_str().unwrap()),
+            program: program.clone(),
             inner: e,
         })?;
     drop(stdin);
@@ -124,14 +126,14 @@ pub fn apply_ruleset_raw(
             let stderr = read_output(&nft_cmd, process_result.stderr)?;
 
             Err(NftablesError::NftFailed {
-                program: format!("{}", nft_cmd.get_program().to_str().unwrap()),
+                program,
                 hint: "applying ruleset".to_string(),
                 stdout,
                 stderr,
             })
         }
         Err(e) => Err(NftablesError::NftExecution {
-            program: format!("{}", nft_cmd.get_program().to_str().unwrap()),
+            program: nft_cmd.get_program().to_str().unwrap().to_string(),
             inner: e,
         }),
     }
@@ -145,6 +147,6 @@ fn get_command(program: Option<&str>) -> Command {
 fn read_output(cmd: &Command, bytes: Vec<u8>) -> Result<String, NftablesError> {
     String::from_utf8(bytes).map_err(|e| NftablesError::NftOutputEncoding {
         inner: e,
-        program: format!("{}", cmd.get_program().to_str().unwrap()),
+        program: cmd.get_program().to_str().unwrap().to_string(),
     })
 }
diff --git a/tests/helper_tests.rs b/tests/helper_tests.rs
@@ -64,9 +64,9 @@ fn example_ruleset() -> schema::Nftables {
     batch.add(schema::NfListObject::Map(schema::Map {
         family: types::NfFamily::IP,
         table: table_name.clone(),
-        name: map_name.clone(),
+        name: map_name,
         handle: None,
-        map: map_type.clone(),
+        map: map_type,
         set_type: schema::SetTypeValue::Single(schema::SetType::Ipv4Addr),
         policy: None,
         flags: None,