commit b7f4bf4eb5b33f0011de2898c1acf95105f5adaa
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 03 09:19:56 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 03 09:19:56 2024 +0000
tree c0f8eb471823389ca54942b057704264d7a2c788
parent 1b316e89cf0c0c43d185e10fcff29cb62098d982
parent f3a2067c7627b0214876c8e44cca309cd5dd82ce

Merge "Update code for Rust 1.82.0" into main am: 9fd87bccb0 am: f3a2067c76

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3387903

Change-Id: I9e72a7dc936ba1b0746fda756113450b5fe877b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

keystore2/src/operation.rs

diff --git a/keystore2/src/operation.rs b/keystore2/src/operation.rs
index 9ae8ccf..c11c1f4 100644
--- a/keystore2/src/operation.rs
+++ b/keystore2/src/operation.rs
@@ -308,9 +308,8 @@
         locked_outcome: &mut Outcome,
         err: Result<T, Error>,
     ) -> Result<T, Error> {
-        match &err {
-            Err(e) => *locked_outcome = Outcome::ErrorCode(error_to_serialized_error(e)),
-            Ok(_) => (),
+        if let Err(e) = &err {
+            *locked_outcome = Outcome::ErrorCode(error_to_serialized_error(e))
         }
         err
     }