refactor: properly re-export streaming_iterator types (#763)

Author: molpopgen

examples/haploid_wright_fisher.rs

@@ -156,7 +156,7 @@ fn stress_test_total_branch_length() {
         // stress test the branch length fn b/c it is not a trivial
         // wrapper around the C API.
         {
-            use streaming_iterator::StreamingIterator;
+            use tskit::StreamingIterator;
             let mut x = f64::NAN;
             if let Ok(mut tree_iter) = ts.tree_iterator(0) {
                 // We will only do the first tree to save time.

src/edge_differences.rs

@@ -236,7 +236,7 @@ impl EdgeDifferencesIterator {
     }
 }
 
-impl streaming_iterator::StreamingIterator for EdgeDifferencesIterator {
+impl crate::StreamingIterator for EdgeDifferencesIterator {
     type Item = EdgeDifferencesIterator;
 
     fn advance(&mut self) {

src/edge_table.rs

@@ -124,7 +124,7 @@ impl PartialEq<EdgeTableRowView<'_>> for EdgeTableRow {
     }
 }
 
-impl streaming_iterator::StreamingIterator for EdgeTableRowView<'_> {
+impl crate::StreamingIterator for EdgeTableRowView<'_> {
     type Item = Self;
 
     row_lending_iterator_get!();

src/individual_table.rs

@@ -82,7 +82,7 @@ impl PartialEq<IndividualTableRowView<'_>> for IndividualTableRow {
     }
 }
 
-impl streaming_iterator::StreamingIterator for IndividualTableRowView<'_> {
+impl crate::StreamingIterator for IndividualTableRowView<'_> {
     type Item = Self;
 
     row_lending_iterator_get!();

src/lib.rs

@@ -82,6 +82,9 @@
 #[cfg(feature = "bindings")]
 pub use sys::bindings;
 
+pub use streaming_iterator::DoubleEndedStreamingIterator;
+pub use streaming_iterator::StreamingIterator;
+
 mod _macros; // Starts w/_ to be sorted at front by rustfmt!
 mod edge_differences;
 mod edge_table;
@@ -117,9 +120,9 @@ pub use site_table::{SiteTable, SiteTableRow};
 pub use sys::flags::*;
 pub use sys::NodeTraversalOrder;
 pub use table_collection::TableCollection;
-pub use traits::TableColumn;
 pub use traits::IndividualLocation;
 pub use traits::IndividualParents;
+pub use traits::TableColumn;
 pub use trees::{Tree, TreeSequence};
 
 // Optional features

src/migration_table.rs

@@ -142,7 +142,7 @@ impl PartialEq<MigrationTableRowView<'_>> for MigrationTableRow {
     }
 }
 
-impl streaming_iterator::StreamingIterator for MigrationTableRowView<'_> {
+impl crate::StreamingIterator for MigrationTableRowView<'_> {
     type Item = Self;
 
     row_lending_iterator_get!();

src/mutation_table.rs

@@ -140,7 +140,7 @@ impl PartialEq<MutationTableRowView<'_>> for MutationTableRow {
     }
 }
 
-impl streaming_iterator::StreamingIterator for MutationTableRowView<'_> {
+impl crate::StreamingIterator for MutationTableRowView<'_> {
     type Item = Self;
 
     row_lending_iterator_get!();

src/node_table.rs

@@ -125,7 +125,7 @@ impl PartialEq<NodeTableRowView<'_>> for NodeTableRow {
     }
 }
 
-impl streaming_iterator::StreamingIterator for NodeTableRowView<'_> {
+impl crate::StreamingIterator for NodeTableRowView<'_> {
     type Item = Self;
 
     row_lending_iterator_get!();

src/population_table.rs

@@ -95,7 +95,7 @@ impl PartialEq<PopulationTableRowView<'_>> for PopulationTableRow {
     }
 }
 
-impl streaming_iterator::StreamingIterator for PopulationTableRowView<'_> {
+impl crate::StreamingIterator for PopulationTableRowView<'_> {
     type Item = Self;
 
     row_lending_iterator_get!();

src/prelude.rs

@@ -1,7 +1,7 @@
 //! Export commonly-use types and traits
 
-pub use streaming_iterator::DoubleEndedStreamingIterator;
-pub use streaming_iterator::StreamingIterator;
+pub use crate::DoubleEndedStreamingIterator;
+pub use crate::StreamingIterator;
 pub use {
     crate::EdgeId, crate::IndividualId, crate::Location, crate::MigrationId, crate::MutationId,
     crate::NodeId, crate::PopulationId, crate::Position, crate::RawFlags, crate::SiteId,