tests compile

Author: molpopgen

src/edge_differences.rs

@@ -122,16 +122,16 @@ pub struct X<'ts, T: EdgeDifferenceIteration> {
     edges_right: &'ts [Position],
     edges_parent: &'ts [NodeId],
     edges_child: &'ts [NodeId],
-    removals: (usize, usize),
+    range: (usize, usize),
     marker: std::marker::PhantomData<T>,
 }
 
 impl<'ts, T: EdgeDifferenceIteration> Iterator for X<'ts, T> {
     type Item = EdgeDifference<T>;
     fn next(&mut self) -> Option<Self::Item> {
-        if self.removals.0 < self.removals.1 {
-            let index = self.removals.0;
-            self.removals.0 += 1;
+        if self.range.0 < self.range.1 {
+            let index = self.range.0;
+            self.range.0 += 1;
             Some(Self::Item::new(
                 self.edges_left[index],
                 self.edges_right[index],
@@ -151,7 +151,7 @@ impl<'ts> EdgeDifferences<'ts> {
             edges_right: self.edges_right,
             edges_parent: self.edges_parent,
             edges_child: self.edges_child,
-            removals: self.removals,
+            range: self.removals,
             marker: std::marker::PhantomData::<Removal> {},
         }
     }
@@ -162,7 +162,7 @@ impl<'ts> EdgeDifferences<'ts> {
             edges_right: self.edges_right,
             edges_parent: self.edges_parent,
             edges_child: self.edges_child,
-            removals: self.insertions,
+            range: self.insertions,
             marker: std::marker::PhantomData::<Insertion> {},
         }
     }

tests/book_trees.rs

@@ -168,17 +168,13 @@ fn initialize_from_table_collection() {
     // }
 
     // ANCHOR: iterate_edge_differences
-    if let Ok(mut edge_diff_iterator) = treeseq.edge_differences_iter() {
-        while let Some(diffs) = edge_diff_iterator.next() {
-            for edge_removal in diffs.edge_removals() {
-                println!("{}", edge_removal);
-            }
-            for edge_insertion in diffs.edge_insertions() {
-                println!("{}", edge_insertion);
-            }
+    for diffs in treeseq.edge_differences_iter() {
+        for edge_removal in diffs.removals() {
+            println!("{}", edge_removal);
+        }
+        for edge_insertion in diffs.insertions() {
+            println!("{}", edge_insertion);
         }
-    } else {
-        panic!("creating edge diffs iterator failed");
     }
     // ANCHOR_END: iterate_edge_differences
 
@@ -187,25 +183,18 @@ fn initialize_from_table_collection() {
     // num_nodes + 1 to reflect a "virtual root" present in
     // the tree arrays
     let mut parents = vec![NodeId::NULL; num_nodes + 1];
-    match treeseq.edge_differences_iter() {
-        Ok(mut ediff_iter) => match treeseq.tree_iterator(0) {
-            Ok(mut tree_iter) => {
-                while let Some(diffs) = ediff_iter.next() {
-                    let tree = tree_iter.next().unwrap();
-                    for edge_out in diffs.edge_removals() {
-                        let c = edge_out.child();
-                        parents[c.as_usize()] = NodeId::NULL;
-                    }
-                    for edge_in in diffs.edge_insertions() {
-                        let c = edge_in.child();
-                        parents[c.as_usize()] = edge_in.parent();
-                    }
-                    assert_eq!(tree.parent_array(), &parents);
-                }
-            }
-            Err(e) => panic!("error creating tree iter: {:?}", e),
-        },
-        Err(e) => panic!("error creating edge diff iter: {:?}", e),
+    let mut tree_iter = treeseq.tree_iterator(0).unwrap();
+    for diffs in treeseq.edge_differences_iter() {
+        let tree = tree_iter.next().unwrap();
+        for edge_out in diffs.removals() {
+            let c = edge_out.child();
+            parents[c.as_usize()] = NodeId::NULL;
+        }
+        for edge_in in diffs.insertions() {
+            let c = edge_in.child();
+            parents[c.as_usize()] = edge_in.parent();
+        }
+        assert_eq!(tree.parent_array(), &parents);
     }
     // ANCHOR_END: iterate_edge_differences_update_parents
 }