commit dabb6fe86559b9d265658cda688baf2dea5ce5a3
author Chris Wailes <chriswailes@google.com> Wed Nov 16 15:56:19 2022 -0800
committer Chris Wailes <chriswailes@google.com> Wed Nov 16 16:07:59 2022 -0800
tree 60b1b5e62a3b9ccd458747fb851b23dfeaca41d3
parent 38cea65f68a04d7f6e3df3dc04d85203ccd5a32c

Fix warnings from rustc 1.65.0

Bug: 250026064
Test: m rust
Change-Id: I90d1ecde006d16967879cec4138e804ad246698d

keystore2/src/audit_log.rs

diff --git a/keystore2/src/audit_log.rs b/keystore2/src/audit_log.rs
index 3d7d26e..07509d3 100644
--- a/keystore2/src/audit_log.rs
+++ b/keystore2/src/audit_log.rs
@@ -67,7 +67,7 @@
 fn log_key_event(tag: u32, key: &KeyDescriptor, calling_app: uid_t, success: bool) {
     with_log_context(tag, |ctx| {
         let owner = key_owner(key.domain, key.nspace, calling_app as i32);
-        ctx.append_i32(if success { 1 } else { 0 })
+        ctx.append_i32(i32::from(success))
             .append_str(key.alias.as_ref().map_or("none", String::as_str))
             .append_i32(owner)
     })

keystore2/src/database.rs

diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index e5a8e4a..dbdb4e6 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -5022,8 +5022,8 @@
         let list_o_keys: Vec<(i64, i64)> = LIST_O_ENTRIES
             .iter()
             .map(|(domain, ns, alias)| {
-                let entry = make_test_key_entry(&mut db, *domain, *ns, *alias, None)
-                    .unwrap_or_else(|e| {
+                let entry =
+                    make_test_key_entry(&mut db, *domain, *ns, alias, None).unwrap_or_else(|e| {
                         panic!("Failed to insert {:?} {} {}. Error {:?}", domain, ns, alias, e)
                     });
                 (entry.id(), *ns)

keystore2/src/gc.rs

diff --git a/keystore2/src/gc.rs b/keystore2/src/gc.rs
index 8d6c569..a033356 100644
--- a/keystore2/src/gc.rs
+++ b/keystore2/src/gc.rs
@@ -126,8 +126,7 @@
                     .unwrap()
                     .unwrap_key_if_required(&blob_metadata, &blob)
                     .context(ks_err!("Trying to unwrap to-be-deleted blob.",))?;
-                (self.invalidate_key)(uuid, &*blob)
-                    .context(ks_err!("Trying to invalidate key."))?;
+                (self.invalidate_key)(uuid, &blob).context(ks_err!("Trying to invalidate key."))?;
             }
         }
         Ok(())

keystore2/src/legacy_importer.rs

diff --git a/keystore2/src/legacy_importer.rs b/keystore2/src/legacy_importer.rs
index be90d09..9eb702d 100644
--- a/keystore2/src/legacy_importer.rs
+++ b/keystore2/src/legacy_importer.rs
@@ -510,7 +510,7 @@
             }
         };
 
-        let (km_params, upgraded_blob) = get_key_characteristics_without_app_data(&km_uuid, &*blob)
+        let (km_params, upgraded_blob) = get_key_characteristics_without_app_data(&km_uuid, &blob)
             .context(ks_err!("Failed to get key characteristics from device.",))?;
 
         let flags = km_blob.get_flags();

keystore2/src/operation.rs

diff --git a/keystore2/src/operation.rs b/keystore2/src/operation.rs
index 58f3985..2034a8a 100644
--- a/keystore2/src/operation.rs
+++ b/keystore2/src/operation.rs
@@ -359,7 +359,7 @@
             .before_update()
             .context(ks_err!("Trying to get auth tokens."))?;
 
-        self.update_outcome(&mut *outcome, {
+        self.update_outcome(&mut outcome, {
             let _wp = wd::watch_millis("Operation::update_aad: calling updateAad", 500);
             map_km_error(self.km_op.updateAad(aad_input, hat.as_ref(), tst.as_ref()))
         })
@@ -383,7 +383,7 @@
             .context(ks_err!("Trying to get auth tokens."))?;
 
         let output = self
-            .update_outcome(&mut *outcome, {
+            .update_outcome(&mut outcome, {
                 let _wp = wd::watch_millis("Operation::update: calling update", 500);
                 map_km_error(self.km_op.update(input, hat.as_ref(), tst.as_ref()))
             })
@@ -413,7 +413,7 @@
             .context(ks_err!("Trying to get auth tokens."))?;
 
         let output = self
-            .update_outcome(&mut *outcome, {
+            .update_outcome(&mut outcome, {
                 let _wp = wd::watch_millis("Operation::finish: calling finish", 500);
                 map_km_error(self.km_op.finish(
                     input,