commit a1e1c4865a2c94141abe0bbfefec9879abe043e9
author Charisee <chiw@google.com> Sat Feb 26 01:26:35 2022 +0000
committer Charisee Chiw <chiw@google.com> Mon Feb 28 21:29:32 2022 +0000
tree e2647fdf00680decc2dfcc970dd7229d77cac203
parent f2a147a6be7ea6d17626c9a740756beedf89ea37

Changes for the Rust 1.59.0 update

bug: 215232614
Test: TreeHugger and compiling with m rust
Change-Id: I1d25f5550f60ff1046a3a312f7bd210483bf9364

keystore2/src/legacy_importer.rs

diff --git a/keystore2/src/legacy_importer.rs b/keystore2/src/legacy_importer.rs
index 81fb06c..5a64020 100644
--- a/keystore2/src/legacy_importer.rs
+++ b/keystore2/src/legacy_importer.rs
@@ -932,8 +932,7 @@
 
         for (uid, alias) in aliases
             .into_iter()
-            .map(|(uid, aliases)| aliases.into_iter().map(move |alias| (uid, alias)))
-            .flatten()
+            .flat_map(|(uid, aliases)| aliases.into_iter().map(move |alias| (uid, alias)))
         {
             let (km_blob_params, _, _) = self
                 .legacy_loader