Fixed a number of clippy warnings that came up with Rust 1.97.0 + added 'upgrade' target to the Makefile.

Author: danieltrick

Makefile

@@ -4,7 +4,7 @@ include tools/docker/docker.mk
 
 DOCKER := $(foreach target,$(DOCKER_TARGETS),docker.$(target))
 
-.PHONY: all bench build check clean clippy codecov docs examples fixup fmt libtpms package publish tests $(DOCKER)
+.PHONY: all bench build check clean clippy codecov docs examples fmt libtpms package publish tests upgrade $(DOCKER)
 
 all: clean check build
 
@@ -20,10 +20,9 @@ clippy: check
 	cargo clippy --no-default-features -- -D warnings
 	cargo clippy --all-features --all-targets -- -D warnings
 
-fixup: check
-	cargo upgrade && cargo update
-	cargo fmt --all
-	cargo clippy --all-features --all-targets
+upgrade:
+	cargo upgrade -i
+	cargo update
 
 tests:
 	CARGO_PROFILE_RELEASE_DEBUG=true RUST_BACKTRACE=1 RUST_LOG=info TSS2_LOG="all+none" \

benches/fapi_benchmark.rs

@@ -71,7 +71,7 @@ mod bench_fapi {
         let mut manager = TpmManager::new();
 
         // Create siging key
-        let sign_key_path = format!("{}/sign_key", &manager.1);
+        let sign_key_path = format!("{}/sign_key", manager.1);
         manager.0.create_key(&sign_key_path, Some(&FLAGS_SIGNING), None, None).expect("Failed to create sign key!");
 
         // Generate random message
@@ -96,7 +96,7 @@ mod bench_fapi {
         let mut manager = TpmManager::new();
 
         // Create siging key
-        let sign_key_path = format!("{}/sign_key", &manager.1);
+        let sign_key_path = format!("{}/sign_key", manager.1);
         manager.0.create_key(&sign_key_path, Some(&FLAGS_SIGNING), None, None).expect("Failed to create sign key!");
 
         // Generate random message

src/callback.rs

@@ -459,7 +459,7 @@ impl CallbackManager {
     fn auth_cb(&self, object_path: &CStr, description: Option<&CStr>) -> Result<CbResult<CStringPointer>, CbError> {
         let mut lock = self.0.lock().unwrap();
         let param = AuthCbParam::new(object_path, description)?;
-        trace!("Callbacks::auth_cb({:?})", &param);
+        trace!("Callbacks::auth_cb({:?})", param);
         match lock.callbacks.auth_cb(param) {
             Ok(auth_value) => Ok(Ok(lock.temp.set_string(CStringHolder::try_from(auth_value).map_err(|_| CbError::InvalidValue)?))),
             Err(error) => Ok(Err(error)),
@@ -477,7 +477,7 @@ impl CallbackManager {
     ) -> Result<CbResult<RawSlice>, CbError> {
         let mut lock = self.0.lock().unwrap();
         let param = SignCbParam::new(object_path, description, public_key, key_hint, hash_algo, challenge)?;
-        trace!("Callbacks::sign_cb({:?})", &param);
+        trace!("Callbacks::sign_cb({:?})", param);
         match lock.callbacks.sign_cb(param) {
             Ok(signature) => Ok(Ok(lock.temp.set_data(CBinaryHolder::try_from(signature).map_err(|_| CbError::InvalidValue)?))),
             Err(error) => Ok(Err(error)),
@@ -487,7 +487,7 @@ impl CallbackManager {
     fn branch_cb(&self, object_path: &CStr, description: Option<&CStr>, branches: &[&CStr]) -> Result<CbResult<usize>, CbError> {
         let mut lock = self.0.lock().unwrap();
         let param = BranchCbParam::new(object_path, description, branches)?;
-        trace!("Callbacks::branch_cb({:?})", &param);
+        trace!("Callbacks::branch_cb({:?})", param);
         Ok(lock.callbacks.branch_cb(param).inspect(|&index| {
             assert!(index < branches.len(), "The chosen branch index #{} is out of range!", index);
         }))
@@ -496,7 +496,7 @@ impl CallbackManager {
     fn policy_action_cb(&self, object_path: &CStr, action: Option<&CStr>) -> Result<CbResult<()>, CbError> {
         let mut lock = self.0.lock().unwrap();
         let param = PolicyActionCbParam::new(object_path, action)?;
-        trace!("Callbacks::policy_action_cb({:?})", &param);
+        trace!("Callbacks::policy_action_cb({:?})", param);
         Ok(lock.callbacks.policy_action_cb(param))
     }
 }

tests/12_duplicate_test.rs

@@ -130,7 +130,7 @@ fn test_duplicate_key() {
         // Enumerate keys
         match context.list(crypt_key2) {
             Ok(mut list) => {
-                let duplicated_key = format!("{}/{}", &crypt_key2, child_key2).to_ascii_lowercase();
+                let duplicated_key = format!("{}/{}", crypt_key2, child_key2).to_ascii_lowercase();
                 assert!(list.drain(..).any(|entry| entry.to_ascii_lowercase().ends_with(&duplicated_key[..])));
             }
             Err(error) => panic!("Failed to enumerate the keys: {:?}", error),

tests/15_description_test.rs

@@ -109,7 +109,7 @@ fn test_get_description() {
         };
 
         // Verify
-        debug!("Description: {:?}", &recovered_descr);
+        debug!("Description: {:?}", recovered_descr);
         assert!(recovered_descr.expect("No description avialble!").trim()[..].eq(desciption.trim()))
     });
 }

tests/common/setup.rs

@@ -99,7 +99,7 @@ impl<'a> TestConfiguration<'a> {
         let temp_path = Path::new(env!("CARGO_TARGET_TMPDIR"));
         debug!("Temp directory: \"{}\"", temp_path.to_str().unwrap());
 
-        let work_path = temp_path.join(format!("fapi-{}", &RANDOM_UUID_PREFIX));
+        let work_path = temp_path.join(format!("fapi-{}", RANDOM_UUID_PREFIX));
         debug!("Work directory: \"{}\"", work_path.to_str().unwrap());
 
         let conf_file = work_path.join("config.json");