commit d77b97f0b69e11637931b2128fb545c6d9b8f39a
author James Farrell <jamesfarrell@google.com> Tue Aug 15 20:03:38 2023 +0000
committer James Farrell <jamesfarrell@google.com> Tue Aug 15 20:03:38 2023 +0000
tree d94e9b1a7881c356f8c74b8d1556cf5f076fd8ff
parent 39d70965bc2d27b551f6242d1eef4c0a40f9f1ad

Changes for Rust 1.72

Replace fold with try_fold

Bug: 295883071
Change-Id: I2b0b102d673f051ec52f6ba8caa6bd73030100b0

keystore2/src/maintenance.rs

diff --git a/keystore2/src/maintenance.rs b/keystore2/src/maintenance.rs
index 73dc881..8c9ed63 100644
--- a/keystore2/src/maintenance.rs
+++ b/keystore2/src/maintenance.rs
@@ -178,7 +178,7 @@
             (SecurityLevel::TRUSTED_ENVIRONMENT, "TRUSTED_ENVIRONMENT"),
             (SecurityLevel::STRONGBOX, "STRONGBOX"),
         ];
-        sec_levels.iter().fold(Ok(()), move |result, (sec_level, sec_level_string)| {
+        sec_levels.iter().try_fold((), |_result, (sec_level, sec_level_string)| {
             let curr_result = Maintenance::call_with_watchdog(*sec_level, name, &op);
             match curr_result {
                 Ok(()) => log::info!(
@@ -193,7 +193,7 @@
                     e
                 ),
             }
-            result.and(curr_result)
+            curr_result
         })
     }