commit 911a8215e9b90cac004c98f3ad85b26376dbb88c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 04 00:21:17 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 04 00:21:17 2024 +0000
tree c0f8eb471823389ca54942b057704264d7a2c788
parent d618197e4f07fba0e6599589068bfe25a1b9ec1d
parent b7f4bf4eb5b33f0011de2898c1acf95105f5adaa

Snap for 12742097 from b7f4bf4eb5b33f0011de2898c1acf95105f5adaa to 25Q1-release

Change-Id: Ib5e091f788e1ab46630593a4a26c8cb2c48d1f8b

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
     }