Skip to content

Commit

Permalink
Fix problem reported by Clippy (rust 1.62)
Browse files Browse the repository at this point in the history
Signed-off-by: Mohamed Omar Asaker <mohamed.omarasaker@arm.com>
  • Loading branch information
mohamedasaker-arm committed Jul 13, 2022
1 parent 951e610 commit 60e1a0c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/key_info_managers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ impl KeyInfoManagerClient {
let mut clients = Vec::new();
for key_identity in key_identities {
if !clients.contains(&key_identity.application) {
let _ = clients.push(key_identity.application.clone());
clients.push(key_identity.application.clone());
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/providers/mbed_crypto/key_management.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub fn create_key_id(max_current_id: &AtomicU32) -> Result<key::psa_key_id_t> {
if new_key_id > key::PSA_KEY_ID_USER_MAX {
// If storing key failed and no other keys were created in the mean time, it is safe to
// decrement the key counter.
let _ = max_current_id.store(key::PSA_KEY_ID_USER_MAX, Relaxed);
max_current_id.store(key::PSA_KEY_ID_USER_MAX, Relaxed);
error!(
"PSA max key ID limit of {} reached",
key::PSA_KEY_ID_USER_MAX
Expand Down Expand Up @@ -226,7 +226,7 @@ impl Provider {
);

let key_id = self.key_info_store.get_key_id(&key_identity)?;
let _ = self.key_info_store.remove_key_info(&key_identity)?;
self.key_info_store.remove_key_info(&key_identity)?;

let _guard = self
.key_handle_mutex
Expand Down
4 changes: 2 additions & 2 deletions src/providers/tpm/key_management.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl Provider {

// Grab key attributes and replace legacy entry with new one
let attributes = self.key_info_store.get_key_attributes(key_identity)?;
let _ = self.key_info_store.replace_key_info(
self.key_info_store.replace_key_info(
key_identity.clone(),
&password_ctx,
attributes,
Expand Down Expand Up @@ -195,7 +195,7 @@ impl Provider {
key_name,
);

let _ = self.key_info_store.remove_key_info(&key_identity)?;
self.key_info_store.remove_key_info(&key_identity)?;

Ok(psa_destroy_key::Result {})
}
Expand Down
4 changes: 2 additions & 2 deletions src/providers/trusted_service/context/key_management.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl Context {
}),
}),
};
let _ = self.send_request(&generate_req)?;
self.send_request(&generate_req)?;

Ok(())
}
Expand Down Expand Up @@ -70,7 +70,7 @@ impl Context {
}),
data,
};
let _ = self.send_request(&import_req)?;
self.send_request(&import_req)?;

Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions src/providers/trusted_service/key_management.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub fn create_key_id(max_current_id: &AtomicU32) -> Result<u32> {
if new_key_id > PSA_KEY_ID_USER_MAX {
// If storing key failed and no other keys were created in the mean time, it is safe to
// decrement the key counter.
let _ = max_current_id.store(PSA_KEY_ID_USER_MAX, Relaxed);
max_current_id.store(PSA_KEY_ID_USER_MAX, Relaxed);
error!("PSA max key ID limit of {} reached", PSA_KEY_ID_USER_MAX);
return Err(ResponseStatus::PsaErrorInsufficientMemory);
}
Expand Down Expand Up @@ -193,7 +193,7 @@ impl Provider {
key_name,
);
let key_id = self.key_info_store.get_key_id(&key_identity)?;
let _ = self.key_info_store.remove_key_info(&key_identity)?;
self.key_info_store.remove_key_info(&key_identity)?;

match self.context.destroy_key(key_id) {
Ok(()) => Ok(psa_destroy_key::Result {}),
Expand Down
2 changes: 1 addition & 1 deletion src/utils/service_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ fn build_providers(
return Err(Error::new(ErrorKind::Other, "failed to create provider").into());
}
};
let _ = providers.push((provider_id, provider));
providers.push((provider_id, provider));
}

Ok(providers)
Expand Down

0 comments on commit 60e1a0c

Please sign in to comment.