Upgrade im crate to 15.1

Summary: Upgrading im crate to 15.1 to avoid impact of CVE-2020-36204

Differential Revision: D40282205

fbshipit-source-id: e7888c17ecf5ddfb1d6beb539122f844a674230e

Author: yuxuanchen1997

rust/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 smallvec = { version = "1.9.0", features = ["const_generics"] }
 disjoint-sets = "0.4.2"
-im = "14.2.0"
+im = "15.1.0"
 petgraph = "0.6.2"
 sparta-proc-macros = { path = "../rust-proc-macros", version = "0.1.0" }
 

rust/src/datatype/abstract_environment.rs

@@ -222,12 +222,8 @@ where
         match (lhs, rhs) {
             (Value(l_map), Value(ref mut r_map)) => {
                 l_map.retain(|l_k, _| r_map.contains_key(l_k));
-
-                // NOTE: implcit prerequisite: key() and iter_mut() get the same order for the same map.
-                // When `im` crate upgrades to 15.1, we could simply use iter_mut() as it will get both
-                // keys and values.
-                let r_vs: Vec<_> = l_map.keys().map(|l_k| r_map.remove(l_k).unwrap()).collect();
-                for (l_v, r_v) in l_map.iter_mut().zip(r_vs) {
+                for (l_k, l_v) in l_map.iter_mut() {
+                    let r_v = r_map.remove(l_k).unwrap();
                     operation(l_v, r_v);
                 }
                 l_map.retain(|_, l_v| !l_v.is_top());

rust/src/datatype/abstract_partition.rs

@@ -238,9 +238,8 @@ where
             (_, Top) => {}
             (Value(l_map), Value(mut r_map)) => {
                 l_map.retain(|l_k, _| r_map.contains_key(l_k));
-
-                let r_vs: Vec<_> = l_map.keys().map(|l_k| r_map.remove(l_k).unwrap()).collect();
-                for (l_v, r_v) in l_map.iter_mut().zip(r_vs) {
+                for (l_k, l_v) in l_map.iter_mut() {
+                    let r_v = r_map.remove(l_k).unwrap();
                     operation(l_v, r_v);
                 }