commit 9fd87bccb080c35cf690a407d7649d7459208b4a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 03 08:37:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 03 08:37:23 2024 +0000
tree 0d8b0cdecc87669f17e6b91444cee89177caad04
parent 031ff9e635b2eb477b8e190100d53cea98090729
parent e5f3087032cbd49c0e94be9a2152cf2c04669f78

Merge "Update code for Rust 1.82.0" into main

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
     }