tidy

Author: molpopgen

src/table_column.rs

@@ -70,116 +70,3 @@ where
         self.0.get(usize::try_from(at).unwrap())
     }
 }
-// macro_rules! make_table_column {
-//     ($name: ident, $index: ident) => {
-//         /// Immutable view of a (non-ragged) column
-//         #[derive(Clone, Debug)]
-//         #[repr(transparent)]
-//         pub struct $name<'table, T>(&'table [T]);
-//
-//         impl<'table, T> $name<'table, T> {
-//             pub(crate) fn new(column: &'table [T]) -> $name<'table, T> {
-//                 Self(column)
-//             }
-//
-//             /// View the underlying slice
-//             pub fn as_slice(&self) -> &[T] {
-//                 self.0
-//             }
-//
-//             pub fn get_with_id(&self, index: crate::$index) -> Option<&T> {
-//                 self.get_with_usize(usize::try_from(index).ok()?)
-//             }
-//
-//             pub fn get_with_size_type(&self, index: crate::SizeType) -> Option<&T> {
-//                 self.get_with_usize(usize::try_from(index).ok()?)
-//             }
-//
-//             pub fn get_with_usize(&self, index: usize) -> Option<&T> {
-//                 self.0.get(index)
-//             }
-//         }
-//
-//         impl<'table, T> $name<'table, T>
-//         where
-//             T: Copy,
-//         {
-//             pub fn iter(&self) -> impl Iterator<Item = T> + '_ {
-//                 self.0.iter().map(|&value| value)
-//             }
-//         }
-//
-//         impl<T> std::ops::Index<usize> for $name<'_, T> {
-//             type Output = T;
-//             fn index(&self, index: usize) -> &Self::Output {
-//                 &self.0[index]
-//             }
-//         }
-//
-//         impl<T> std::ops::Index<crate::$index> for $name<'_, T> {
-//             type Output = T;
-//             fn index(&self, index: crate::$index) -> &Self::Output {
-//                 &self.0[usize::try_from(index).unwrap()]
-//             }
-//         }
-//
-//         impl<T> std::ops::Index<crate::SizeType> for $name<'_, T> {
-//             type Output = T;
-//             fn index(&self, index: crate::SizeType) -> &Self::Output {
-//                 &self.0[usize::try_from(index).unwrap()]
-//             }
-//         }
-//
-//         impl<T> std::convert::AsRef<[T]> for $name<'_, T> {
-//             fn as_ref(&self) -> &[T] {
-//                 self.as_slice()
-//             }
-//         }
-//     };
-// }
-//
-// make_table_column!(NodeTableColumn, NodeId);
-// make_table_column!(EdgeTableColumn, EdgeId);
-// make_table_column!(SiteTableColumn, SiteId);
-// make_table_column!(MutationTableColumn, MutationId);
-// make_table_column!(PopulationTableColumn, PopulationId);
-// make_table_column!(IndividualTableColumn, IndividualId);
-// make_table_column!(MigrationTableColumn, MigrationId);
-//
-// #[cfg(test)]
-// make_table_column!(TestTableColumn, NodeId);
-//
-// #[test]
-// fn test_table_column_get_usize() {
-//     let v = vec![1, 2, 3];
-//     let c = TestTableColumn::new(&v);
-//     assert_eq!(c.get_with_usize(1), Some(&2))
-// }
-//
-// #[test]
-// fn test_table_column_get_size_type() {
-//     let v = vec![1, 2, 3];
-//     let c = TestTableColumn(&v);
-//     assert_eq!(c.get_with_size_type(crate::SizeType::from(1)), Some(&2))
-// }
-//
-// #[test]
-// fn test_table_column_get_id() {
-//     let v = vec![1, 2, 3];
-//     let c = TestTableColumn::new(&v);
-//     assert_eq!(c.get_with_id(1.into()), Some(&2))
-// }
-//
-// #[test]
-// fn test_table_column_as_ref() {
-//     let v = vec![1, 2, 3];
-//     let c = TestTableColumn::new(&v);
-//     assert_eq!(c.as_ref(), v.as_slice())
-// }
-//
-// #[test]
-// fn test_table_column_iter() {
-//     let v = vec![1, 2, 3];
-//     let c = TestTableColumn::new(&v);
-//     assert_eq!(c.iter().collect::<Vec::<_>>(), [1, 2, 3]);
-// }