refactor: redo Tree internals

examples/haploid_wright_fisher.rs

@@ -163,7 +163,7 @@ fn stress_test_total_branch_length() {
                 if let Some(tree) = tree_iter.next() {
                     let b = tree.total_branch_length(false).unwrap();
                     let b2 = unsafe {
-                        tskit::bindings::tsk_tree_get_total_branch_length(tree.as_ptr(), -1, &mut x)
+                        tskit::bindings::tsk_tree_get_total_branch_length(tree.as_ll_ref(), -1, &mut x)
                     };
                     assert!(b2 >= 0, "{}", b2);
                     assert!(f64::from(b) - x <= 1e-8);

src/_macros.rs

@@ -53,18 +53,6 @@ macro_rules! table_row_access {
     };
 }
 
-macro_rules! iterator_for_nodeiterator {
-    ($ty: ty) => {
-        impl Iterator for $ty {
-            type Item = $crate::NodeId;
-            fn next(&mut self) -> Option<Self::Item> {
-                self.next_node();
-                self.current_node()
-            }
-        }
-    };
-}
-
 /// Convenience macro to handle implementing
 /// [`crate::metadata::MetadataRoundtrip`]
 #[macro_export]

src/lib.rs

@@ -99,7 +99,6 @@ mod table_collection;
 mod table_iterator;
 mod table_views;
 mod traits;
-mod tree_interface;
 mod trees;
 pub mod types;
 mod util;
@@ -115,10 +114,10 @@ pub use node_table::{NodeDefaults, NodeDefaultsWithMetadata, NodeTable, NodeTabl
 pub use population_table::{PopulationTable, PopulationTableRow};
 pub use site_table::{SiteTable, SiteTableRow};
 pub use sys::flags::*;
+pub use sys::NodeTraversalOrder;
 pub use table_collection::TableCollection;
 pub use traits::IndividualLocation;
 pub use traits::IndividualParents;
-pub use tree_interface::{NodeTraversalOrder, TreeInterface};
 pub use trees::{Tree, TreeSequence};
 
 // Optional features

src/sys/mod.rs

@@ -42,6 +42,7 @@ pub use provenance_table::ProvenanceTable;
 pub use site_table::SiteTable;
 pub use table_collection::*;
 pub use tree::LLTree;
+pub use tree::NodeTraversalOrder;
 pub use treeseq::TreeSequence;
 
 use traits::TskTeardown;