| commit | f3a2067c7627b0214876c8e44cca309cd5dd82ce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Dec 03 08:56:51 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 03 08:56:51 2024 +0000 |
| tree | c0f8eb471823389ca54942b057704264d7a2c788 | |
| parent | 52c614cec545c982cead914975c53c7856ce65d6 [diff] | |
| parent | 9fd87bccb080c35cf690a407d7649d7459208b4a [diff] |
Merge "Update code for Rust 1.82.0" into main am: 9fd87bccb0 Original change: https://android-review.googlesource.com/c/platform/system/security/+/3387903 Change-Id: I74b09ba7f945c46f5bdd001d8b01f13493c191cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 }