Merge "Revert "Update hashbrown to 0.12.0"" am: 94cdad0346 am: 589fdf95b1 am: 538884f4c1t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hashbrown/+/2020795

Change-Id: Ifed4ba4e348096de88f0b11e8178572996194ac6

2 files changed, 50 insertions, 54 deletions

diff --git a/tests/rayon.rs b/tests/rayon.rs
index 8c603c5..39b4770 100644
--- a/tests/rayon.rs
+++ b/tests/rayon.rs
@@ -269,20 +269,20 @@ fn map_seq_par_equivalence_existing_empty_extend_empty() {
     let mut map_seq = MAP_EXISTING_EMPTY.clone();
     let mut map_par = MAP_EXISTING_EMPTY.clone();
 
-    map_seq.extend(MAP_EXTENSION_EMPTY.iter().copied());
-    map_par.par_extend(MAP_EXTENSION_EMPTY.par_iter().copied());
+    map_seq.extend(MAP_EXTENSION_EMPTY.iter().cloned());
+    map_par.par_extend(MAP_EXTENSION_EMPTY.par_iter().cloned());
 
     assert_eq3!(map_seq, map_par, expected);
 }
 
 #[test]
 fn map_seq_par_equivalence_existing_empty_extend() {
-    let expected = MAP_EXTENSION.iter().copied().collect::<HashMap<_, _>>();
+    let expected = MAP_EXTENSION.iter().cloned().collect::<HashMap<_, _>>();
     let mut map_seq = MAP_EXISTING_EMPTY.clone();
     let mut map_par = MAP_EXISTING_EMPTY.clone();
 
-    map_seq.extend(MAP_EXTENSION.iter().copied());
-    map_par.par_extend(MAP_EXTENSION.par_iter().copied());
+    map_seq.extend(MAP_EXTENSION.iter().cloned());
+    map_par.par_extend(MAP_EXTENSION.par_iter().cloned());
 
     assert_eq3!(map_seq, map_par, expected);
 }
@@ -293,8 +293,8 @@ fn map_seq_par_equivalence_existing_extend_empty() {
     let mut map_seq = MAP_EXISTING.clone();
     let mut map_par = MAP_EXISTING.clone();
 
-    map_seq.extend(MAP_EXTENSION_EMPTY.iter().copied());
-    map_par.par_extend(MAP_EXTENSION_EMPTY.par_iter().copied());
+    map_seq.extend(MAP_EXTENSION_EMPTY.iter().cloned());
+    map_par.par_extend(MAP_EXTENSION_EMPTY.par_iter().cloned());
 
     assert_eq3!(map_seq, map_par, expected);
 }
@@ -305,8 +305,8 @@ fn map_seq_par_equivalence_existing_extend() {
     let mut map_seq = MAP_EXISTING.clone();
     let mut map_par = MAP_EXISTING.clone();
 
-    map_seq.extend(MAP_EXTENSION.iter().copied());
-    map_par.par_extend(MAP_EXTENSION.par_iter().copied());
+    map_seq.extend(MAP_EXTENSION.iter().cloned());
+    map_par.par_extend(MAP_EXTENSION.par_iter().cloned());
 
     assert_eq3!(map_seq, map_par, expected);
 }
@@ -423,20 +423,20 @@ fn set_seq_par_equivalence_existing_empty_extend_empty() {
     let mut set_seq = SET_EXISTING_EMPTY.clone();
     let mut set_par = SET_EXISTING_EMPTY.clone();
 
-    set_seq.extend(SET_EXTENSION_EMPTY.iter().copied());
-    set_par.par_extend(SET_EXTENSION_EMPTY.par_iter().copied());
+    set_seq.extend(SET_EXTENSION_EMPTY.iter().cloned());
+    set_par.par_extend(SET_EXTENSION_EMPTY.par_iter().cloned());
 
     assert_eq3!(set_seq, set_par, expected);
 }
 
 #[test]
 fn set_seq_par_equivalence_existing_empty_extend() {
-    let expected = SET_EXTENSION.iter().copied().collect::<HashSet<_>>();
+    let expected = SET_EXTENSION.iter().cloned().collect::<HashSet<_>>();
     let mut set_seq = SET_EXISTING_EMPTY.clone();
     let mut set_par = SET_EXISTING_EMPTY.clone();
 
-    set_seq.extend(SET_EXTENSION.iter().copied());
-    set_par.par_extend(SET_EXTENSION.par_iter().copied());
+    set_seq.extend(SET_EXTENSION.iter().cloned());
+    set_par.par_extend(SET_EXTENSION.par_iter().cloned());
 
     assert_eq3!(set_seq, set_par, expected);
 }
@@ -447,8 +447,8 @@ fn set_seq_par_equivalence_existing_extend_empty() {
     let mut set_seq = SET_EXISTING.clone();
     let mut set_par = SET_EXISTING.clone();
 
-    set_seq.extend(SET_EXTENSION_EMPTY.iter().copied());
-    set_par.par_extend(SET_EXTENSION_EMPTY.par_iter().copied());
+    set_seq.extend(SET_EXTENSION_EMPTY.iter().cloned());
+    set_par.par_extend(SET_EXTENSION_EMPTY.par_iter().cloned());
 
     assert_eq3!(set_seq, set_par, expected);
 }
@@ -459,37 +459,37 @@ fn set_seq_par_equivalence_existing_extend() {
     let mut set_seq = SET_EXISTING.clone();
     let mut set_par = SET_EXISTING.clone();
 
-    set_seq.extend(SET_EXTENSION.iter().copied());
-    set_par.par_extend(SET_EXTENSION.par_iter().copied());
+    set_seq.extend(SET_EXTENSION.iter().cloned());
+    set_par.par_extend(SET_EXTENSION.par_iter().cloned());
 
     assert_eq3!(set_seq, set_par, expected);
 }
 
 lazy_static! {
-    static ref SET_A: HashSet<char> = ['a', 'b', 'c', 'd'].iter().copied().collect();
-    static ref SET_B: HashSet<char> = ['a', 'b', 'e', 'f'].iter().copied().collect();
-    static ref SET_DIFF_AB: HashSet<char> = ['c', 'd'].iter().copied().collect();
-    static ref SET_DIFF_BA: HashSet<char> = ['e', 'f'].iter().copied().collect();
-    static ref SET_SYMM_DIFF_AB: HashSet<char> = ['c', 'd', 'e', 'f'].iter().copied().collect();
-    static ref SET_INTERSECTION_AB: HashSet<char> = ['a', 'b'].iter().copied().collect();
+    static ref SET_A: HashSet<char> = ['a', 'b', 'c', 'd'].iter().cloned().collect();
+    static ref SET_B: HashSet<char> = ['a', 'b', 'e', 'f'].iter().cloned().collect();
+    static ref SET_DIFF_AB: HashSet<char> = ['c', 'd'].iter().cloned().collect();
+    static ref SET_DIFF_BA: HashSet<char> = ['e', 'f'].iter().cloned().collect();
+    static ref SET_SYMM_DIFF_AB: HashSet<char> = ['c', 'd', 'e', 'f'].iter().cloned().collect();
+    static ref SET_INTERSECTION_AB: HashSet<char> = ['a', 'b'].iter().cloned().collect();
     static ref SET_UNION_AB: HashSet<char> =
-        ['a', 'b', 'c', 'd', 'e', 'f'].iter().copied().collect();
+        ['a', 'b', 'c', 'd', 'e', 'f'].iter().cloned().collect();
 }
 
 #[test]
 fn set_seq_par_equivalence_difference() {
-    let diff_ab_seq = SET_A.difference(&*SET_B).copied().collect::<HashSet<_>>();
+    let diff_ab_seq = SET_A.difference(&*SET_B).cloned().collect::<HashSet<_>>();
     let diff_ab_par = SET_A
         .par_difference(&*SET_B)
-        .copied()
+        .cloned()
         .collect::<HashSet<_>>();
 
     assert_eq3!(diff_ab_seq, diff_ab_par, *SET_DIFF_AB);
 
-    let diff_ba_seq = SET_B.difference(&*SET_A).copied().collect::<HashSet<_>>();
+    let diff_ba_seq = SET_B.difference(&*SET_A).cloned().collect::<HashSet<_>>();
     let diff_ba_par = SET_B
         .par_difference(&*SET_A)
-        .copied()
+        .cloned()
         .collect::<HashSet<_>>();
 
     assert_eq3!(diff_ba_seq, diff_ba_par, *SET_DIFF_BA);
@@ -499,11 +499,11 @@ fn set_seq_par_equivalence_difference() {
 fn set_seq_par_equivalence_symmetric_difference() {
     let symm_diff_ab_seq = SET_A
         .symmetric_difference(&*SET_B)
-        .copied()
+        .cloned()
         .collect::<HashSet<_>>();
     let symm_diff_ab_par = SET_A
         .par_symmetric_difference(&*SET_B)
-        .copied()
+        .cloned()
         .collect::<HashSet<_>>();
 
     assert_eq3!(symm_diff_ab_seq, symm_diff_ab_par, *SET_SYMM_DIFF_AB);
@@ -511,10 +511,10 @@ fn set_seq_par_equivalence_symmetric_difference() {
 
 #[test]
 fn set_seq_par_equivalence_intersection() {
-    let intersection_ab_seq = SET_A.intersection(&*SET_B).copied().collect::<HashSet<_>>();
+    let intersection_ab_seq = SET_A.intersection(&*SET_B).cloned().collect::<HashSet<_>>();
     let intersection_ab_par = SET_A
         .par_intersection(&*SET_B)
-        .copied()
+        .cloned()
         .collect::<HashSet<_>>();
 
     assert_eq3!(
@@ -526,8 +526,8 @@ fn set_seq_par_equivalence_intersection() {
 
 #[test]
 fn set_seq_par_equivalence_union() {
-    let union_ab_seq = SET_A.union(&*SET_B).copied().collect::<HashSet<_>>();
-    let union_ab_par = SET_A.par_union(&*SET_B).copied().collect::<HashSet<_>>();
+    let union_ab_seq = SET_A.union(&*SET_B).cloned().collect::<HashSet<_>>();
+    let union_ab_par = SET_A.par_union(&*SET_B).cloned().collect::<HashSet<_>>();
 
     assert_eq3!(union_ab_seq, union_ab_par, *SET_UNION_AB);
 }
diff --git a/tests/set.rs b/tests/set.rs
index 5ae1ec9..3fc0717 100644
--- a/tests/set.rs
+++ b/tests/set.rs
@@ -2,33 +2,29 @@
 
 use hashbrown::HashSet;
 use rand::{distributions::Alphanumeric, rngs::SmallRng, Rng, SeedableRng};
-use std::iter;
 
 #[test]
 fn test_hashset_insert_remove() {
     let mut m: HashSet<Vec<char>> = HashSet::new();
-    let seed = u64::from_le_bytes(*b"testseed");
+    //let num: u32 = 4096;
+    //let tx: Vec<Vec<u8>> = (0..num).map(|i| (i..(16 + i)).collect()).collect();
+    let seed: [u8; 16] = [
+        130, 220, 246, 217, 111, 124, 221, 189, 190, 234, 121, 93, 67, 95, 100, 43,
+    ];
 
-    let rng = &mut SmallRng::seed_from_u64(seed);
-    let tx: Vec<Vec<char>> = iter::repeat_with(|| {
-        rng.sample_iter(&Alphanumeric)
-            .take(32)
-            .map(char::from)
-            .collect()
-    })
-    .take(4096)
-    .collect();
+    let rng = &mut SmallRng::from_seed(seed);
+    let tx: Vec<Vec<char>> = (0..4096)
+        .map(|_| (rng.sample_iter(&Alphanumeric).take(32).collect()))
+        .collect();
 
-    // more readable with explicit `true` / `false`
-    #[allow(clippy::bool_assert_comparison)]
     for _ in 0..32 {
-        for x in &tx {
-            assert_eq!(m.contains(x), false);
-            assert_eq!(m.insert(x.clone()), true);
+        for i in 0..4096 {
+            assert_eq!(m.contains(&tx[i].clone()), false);
+            assert_eq!(m.insert(tx[i].clone()), true);
         }
-        for (i, x) in tx.iter().enumerate() {
-            println!("removing {} {:?}", i, x);
-            assert_eq!(m.remove(x), true);
+        for i in 0..4096 {
+            println!("removing {} {:?}", i, tx[i]);
+            assert_eq!(m.remove(&tx[i]), true);
         }
     }
 }