commit c3f67eab259332eef8696466aa35b868c612ebd9
author Charisee <chiw@google.com> Fri Mar 03 02:12:50 2023 +0000
committer Charisee Chiw <chiw@google.com> Fri Mar 03 07:34:04 2023 +0000
tree c74331d58f9fb81df33a84526463c4a46541cb56
parent 801a2acd2782a37b7b83fed8dc16c5d654ee98df

Change request for Rust v1.68.0

error: useless conversion to the same type: `std::ops::Range<i32>`
  --> system/security/keystore2/tests/keystore2_client_operation_tests.rs:47:5
   |
47 | /     (0..max_ops)
48 | |         .into_iter()
   | |____________________^ help: consider removing `.into_iter()`: `(0..max_ops)`

bug: 270756468
Test: test_compiler.py
Change-Id: Ib661ecaf1f30a1e165b6fb3bde4d0fc93758891e

keystore2/src/shared_secret_negotiation.rs

diff --git a/keystore2/src/shared_secret_negotiation.rs b/keystore2/src/shared_secret_negotiation.rs
index 42d38d2..81644ec 100644
--- a/keystore2/src/shared_secret_negotiation.rs
+++ b/keystore2/src/shared_secret_negotiation.rs
@@ -121,11 +121,11 @@
     let mut legacy_strongbox_found: bool = false;
     Ok([(4, 1), (4, 0)]
         .iter()
-        .map(|(ma, mi)| {
+        .flat_map(|(ma, mi)| {
             get_hidl_instances(KEYMASTER_PACKAGE_NAME, *ma, *mi, KEYMASTER_INTERFACE_NAME)
-                .into_iter()
+                .iter()
                 .filter_map(|name| {
-                    filter_map_legacy_km_instances(name, (*ma, *mi)).and_then(|sp| {
+                    filter_map_legacy_km_instances(name.to_string(), (*ma, *mi)).and_then(|sp| {
                         if let SharedSecretParticipant::Hidl { is_strongbox: true, .. } = &sp {
                             if !legacy_strongbox_found {
                                 legacy_strongbox_found = true;
@@ -140,8 +140,6 @@
                 })
                 .collect::<Vec<SharedSecretParticipant>>()
         })
-        .into_iter()
-        .flatten()
         .chain({
             get_aidl_instances(SHARED_SECRET_PACKAGE_NAME, 1, SHARED_SECRET_INTERFACE_NAME)
                 .into_iter()