move

Author: molpopgen

src/edge_table.rs

@@ -358,19 +358,19 @@ impl EdgeTable {
         /// Get the child column as a slice of the underlying integer type
         => child, child_slice_raw, ll_bindings::tsk_id_t);
 
-    pub fn parent_column(&self) -> impl crate::table_column::TableColumn<EdgeId, NodeId> + '_ {
+    pub fn parent_column(&self) -> impl crate::TableColumn<EdgeId, NodeId> + '_ {
         crate::table_column::OpaqueTableColumn(self.parent_slice())
     }
 
-    pub fn child_column(&self) -> impl crate::table_column::TableColumn<EdgeId, NodeId> + '_ {
+    pub fn child_column(&self) -> impl crate::TableColumn<EdgeId, NodeId> + '_ {
         crate::table_column::OpaqueTableColumn(self.child_slice())
     }
 
-    pub fn left_column(&self) -> impl crate::table_column::TableColumn<EdgeId, Position> + '_ {
+    pub fn left_column(&self) -> impl crate::TableColumn<EdgeId, Position> + '_ {
         crate::table_column::OpaqueTableColumn(self.left_slice())
     }
 
-    pub fn right_column(&self) -> impl crate::table_column::TableColumn<EdgeId, Position> + '_ {
+    pub fn right_column(&self) -> impl crate::TableColumn<EdgeId, Position> + '_ {
         crate::table_column::OpaqueTableColumn(self.right_slice())
     }
 

src/lib.rs

@@ -117,7 +117,7 @@ pub use site_table::{SiteTable, SiteTableRow};
 pub use sys::flags::*;
 pub use sys::NodeTraversalOrder;
 pub use table_collection::TableCollection;
-pub use table_column::TableColumn;
+pub use traits::TableColumn;
 pub use traits::IndividualLocation;
 pub use traits::IndividualParents;
 pub use trees::{Tree, TreeSequence};

src/table_column.rs

@@ -10,13 +10,6 @@ impl<T> std::ops::Index<usize> for OpaqueTableColumn<'_, T> {
     }
 }
 
-mod private {
-    pub trait NewTypeMarker: TryInto<usize, Error = crate::TskitError> {}
-    pub trait TableColumnMarker {}
-}
-
-impl private::NewTypeMarker for crate::EdgeId {}
-impl private::NewTypeMarker for crate::NodeId {}
 
 impl<T> std::ops::Index<crate::SizeType> for OpaqueTableColumn<'_, T> {
     type Output = T;
@@ -26,47 +19,3 @@ impl<T> std::ops::Index<crate::SizeType> for OpaqueTableColumn<'_, T> {
     }
 }
 
-impl<I, T> std::ops::Index<I> for OpaqueTableColumn<'_, T>
-where
-    I: private::NewTypeMarker,
-{
-    type Output = T;
-    fn index(&self, index: I) -> &Self::Output {
-        &self.0[index.try_into().unwrap()]
-    }
-}
-
-pub trait TableColumn<I, T>:
-    std::ops::Index<I, Output = T>
-    + std::ops::Index<usize, Output = T>
-    + std::ops::Index<crate::SizeType, Output = T>
-    + private::TableColumnMarker
-{
-    fn as_slice(&self) -> &[T];
-    fn get(&self, at: usize) -> Option<&T>;
-    fn get_with_id(&self, at: I) -> Option<&T>;
-    fn get_with_size_type(&self, at: crate::SizeType) -> Option<&T>;
-}
-
-impl<T> private::TableColumnMarker for OpaqueTableColumn<'_, T> {}
-
-impl<I, T> TableColumn<I, T> for OpaqueTableColumn<'_, T>
-where
-    I: private::NewTypeMarker,
-{
-    fn as_slice(&self) -> &[T] {
-        self.0
-    }
-
-    fn get(&self, at: usize) -> Option<&T> {
-        self.0.get(at)
-    }
-
-    fn get_with_id(&self, at: I) -> Option<&T> {
-        self.0.get(at.try_into().unwrap())
-    }
-
-    fn get_with_size_type(&self, at: crate::SizeType) -> Option<&T> {
-        self.0.get(usize::try_from(at).unwrap())
-    }
-}

src/traits.rs

@@ -119,3 +119,56 @@ impl_individual_parents!(
 );
 impl_individual_parents!(N, usize, &[crate::IndividualId; N], self, self.as_slice());
 impl_individual_parents!(N, usize, [crate::IndividualId; N], self, self.as_slice());
+
+mod private {
+    pub trait NewTypeMarker: TryInto<usize, Error = crate::TskitError> {}
+    pub trait TableColumnMarker {}
+}
+
+impl private::NewTypeMarker for crate::EdgeId {}
+impl private::NewTypeMarker for crate::NodeId {}
+
+pub trait TableColumn<I, T>:
+    std::ops::Index<I, Output = T>
+    + std::ops::Index<usize, Output = T>
+    + std::ops::Index<crate::SizeType, Output = T>
+    + private::TableColumnMarker
+{
+    fn as_slice(&self) -> &[T];
+    fn get(&self, at: usize) -> Option<&T>;
+    fn get_with_id(&self, at: I) -> Option<&T>;
+    fn get_with_size_type(&self, at: crate::SizeType) -> Option<&T>;
+}
+
+impl<T> private::TableColumnMarker for crate::table_column::OpaqueTableColumn<'_, T> {}
+
+impl<I, T> std::ops::Index<I> for crate::table_column::OpaqueTableColumn<'_, T>
+where
+    I: private::NewTypeMarker,
+{
+    type Output = T;
+    fn index(&self, index: I) -> &Self::Output {
+        &self.0[index.try_into().unwrap()]
+    }
+}
+
+impl<I, T> TableColumn<I, T> for crate::table_column::OpaqueTableColumn<'_, T>
+where
+    I: private::NewTypeMarker,
+{
+    fn as_slice(&self) -> &[T] {
+        self.0
+    }
+
+    fn get(&self, at: usize) -> Option<&T> {
+        self.0.get(at)
+    }
+
+    fn get_with_id(&self, at: I) -> Option<&T> {
+        self.0.get(at.try_into().unwrap())
+    }
+
+    fn get_with_size_type(&self, at: crate::SizeType) -> Option<&T> {
+        self.0.get(usize::try_from(at).unwrap())
+    }
+}