*::metadata table functions require row ID types.

Author: molpopgen

src/individual_table.rs

@@ -132,11 +132,11 @@ impl<'a> IndividualTable<'a> {
     /// # Errors
     ///
     /// * [`TskitError::IndexError`] if `row` is out of range.
-    pub fn metadata<I: Into<IndividualId>, T: metadata::MetadataRoundtrip>(
+    pub fn metadata<T: metadata::MetadataRoundtrip>(
         &'a self,
-        row: I,
+        row: IndividualId,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(self, row.into().0)?;
+        let buffer = metadata_to_vector!(self, row.0)?;
         decode_metadata_row!(T, buffer)
     }
 

src/node_table.rs

@@ -159,11 +159,11 @@ impl<'a> NodeTable<'a> {
         )
     }
 
-    pub fn metadata<N: Into<crate::NodeId>, T: metadata::MetadataRoundtrip>(
+    pub fn metadata<T: metadata::MetadataRoundtrip>(
         &'a self,
-        row: N,
+        row: NodeId,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(self, row.into().0)?;
+        let buffer = metadata_to_vector!(self, row.0)?;
         decode_metadata_row!(T, buffer)
     }
 

src/population_table.rs

@@ -72,11 +72,11 @@ impl<'a> PopulationTable<'a> {
         self.table_.num_rows
     }
 
-    pub fn metadata<P: Into<PopulationId>, T: metadata::MetadataRoundtrip>(
+    pub fn metadata<T: metadata::MetadataRoundtrip>(
         &'a self,
-        row: P,
+        row: PopulationId,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(self, row.into().0)?;
+        let buffer = metadata_to_vector!(self, row.0)?;
         decode_metadata_row!(T, buffer)
     }