analyze: rewrite::distribute: refactor a loop to use itertools all_eq…

…ual()
immunant · Jun 9, 2023 · 2100f0f · 2100f0f
1 parent e4c062c
commit 2100f0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/c2rust-analyze/Cargo.toml b/c2rust-analyze/Cargo.toml
@@ -20,6 +20,7 @@ indexmap = "1.9.2"
 env_logger = "0.10.0"
 log = "0.4.17"
 backtrace = "0.3.67"
+itertools = "0.10"
 
 [build-dependencies]
 c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.18.0" }

diff --git a/c2rust-analyze/src/rewrite/expr/distribute.rs b/c2rust-analyze/src/rewrite/expr/distribute.rs
@@ -1,5 +1,6 @@
 use crate::rewrite::expr::mir_op::{self, MirRewrite};
 use crate::rewrite::expr::unlower::{MirOrigin, MirOriginDesc, PreciseLoc};
+use itertools::Itertools;
 use log::*;
 use rustc_hir::HirId;
 use rustc_middle::mir::Location;
@@ -79,10 +80,7 @@ pub fn distribute(
     // need to add rules to resolve it in a particular way, such as prioritizing one `SubLoc` or
     // `MirOriginDesc` over another.
     for (&hir_id, infos) in &info_map {
-        let all_same_loc = infos
-            .iter()
-            .skip(1)
-            .all(|i| i.loc == infos[0].loc && i.desc == infos[0].desc);
+        let all_same_loc = infos.iter().map(|i| (&i.loc, i.desc)).all_equal();
         if !all_same_loc {
             info!("rewrite info:");
             for i in infos {