strong id type cleanup (#139)

* Fix missing use of IndividualId in NodeTable/NodeTableRow

* *::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

@@ -1,15 +1,15 @@
 use crate::bindings as ll_bindings;
 use crate::metadata;
 use crate::{tsk_flags_t, tsk_id_t, TskitError};
-use crate::{NodeId, PopulationId};
+use crate::{IndividualId, NodeId, PopulationId};
 
 /// Row of a [`NodeTable`]
 pub struct NodeTableRow {
     pub id: NodeId,
     pub time: f64,
     pub flags: tsk_flags_t,
     pub population: PopulationId,
-    pub individual: tsk_id_t,
+    pub individual: IndividualId,
     pub metadata: Option<Vec<u8>>,
 }
 
@@ -146,15 +146,24 @@ impl<'a> NodeTable<'a> {
     ///
     /// Will return [``IndexError``](crate::TskitError::IndexError)
     /// if ``row`` is out of range.
-    pub fn individual<N: Into<NodeId> + Copy>(&'a self, row: N) -> Result<tsk_id_t, TskitError> {
-        unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_.individual)
+    pub fn individual<N: Into<NodeId> + Copy>(
+        &'a self,
+        row: N,
+    ) -> Result<IndividualId, TskitError> {
+        unsafe_tsk_column_access!(
+            row.into().0,
+            0,
+            self.num_rows(),
+            self.table_.individual,
+            IndividualId
+        )
     }
 
-    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)
     }