From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 9 Jul 2021 17:49:38 +0000 (+0100)
Subject: jstest: lower: use new old new for check
X-Git-Tag: otter-0.7.2~201
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dcae6ad2dc183f42695ead65f37c68623bc328e0;p=otter.git

jstest: lower: use new old new for check

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/jstest/jst-lower.rs b/jstest/jst-lower.rs
index eef82fa6..dae32af0 100644
--- a/jstest/jst-lower.rs
+++ b/jstest/jst-lower.rs
@@ -122,28 +122,12 @@ impl Test {
 
     // non-bottom targets are in same stacking order as before
     {
-      #[derive(Debug,Ord,PartialOrd,Eq,PartialEq)]
-      struct Nbt<'o,'n> {
-        old_z: &'o ZCoord,
-        new_z: &'n ZCoord,
-        id: Vpid,
+      for (o, n) in izip!(
+        old.iter().filter(|p| p.target && ! p.bottom),
+        new.iter().filter(|p| p.target && ! p.bottom),
+      ) {
+        assert_eq!(o.id, n.id);
       }
-      let mut nbts = self.targets.iter()
-        .filter_map(|&id| {
-          let p = &self.pieces[&id];
-          if p.bottom() { return None }
-          let old_z = &p.z;
-          let new_z = updated.get(&id).unwrap_or(old_z);
-          Some(Nbt { new_z, old_z, id })
-        })
-        .collect_vec();
-      nbts.sort();
-      nbts.iter().fold1( |nbt0, nbt1| {
-        assert!( nbt0.new_z < nbt1.new_z,
-                 "{:?} {:?} {:?} {:#?}", &self.name, nbt0, nbt1,
-                 &nbts);
-        nbt1
-      });
     }
 
     // no bottom are newly above non-bottom