yay

Author: molpopgen

tests/test_edge_difference_iteration.rs

@@ -71,19 +71,21 @@ fn test_collect_edge_diff_iterators() {
         }
     }
 
-    let removals = {
-        let mut r = vec![];
-        for d in diffs.iter() {
-            for di in d.removals() {
-                r.push(di);
-            }
-        }
-        r
-    };
+    let removals = diffs.iter().flat_map(|d| d.removals()).collect::<Vec<_>>();
     let insertions = diffs.iter().map(|i| i.insertions()).collect::<Vec<_>>();
 
     let removal_order = ts.edge_removal_order();
-    assert_eq!(removals.len(), removal_order.len());
+    // Removals have some nuance:
+    // The "standard" loop ends when all IMSERTIONS havee
+    // been processed, which means that all edges
+    // leaving the tree at the "sequence length" are never visited.
+    let num_removals_not_at_end = removal_order
+        .iter()
+        .filter(|r| {
+            ts.tables().edges().right_column()[r.as_usize()] != ts.tables().sequence_length()
+        })
+        .count();
+    assert_eq!(removals.len(), num_removals_not_at_end);
 
     for (i, j) in removals.iter().zip(removal_order.iter()) {
         assert_eq!(