NodeTable::metadata now uses Into<NodeId>. (#134)

molpopgen · web-flow · commit 8bf7d4b9549b · 2021-07-21T08:00:03.000-07:00
Missed this in #129
diff --git a/src/node_table.rs b/src/node_table.rs
@@ -141,11 +141,11 @@ impl<'a> NodeTable<'a> {
         unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_.individual)
     }
 
-    pub fn metadata<T: metadata::MetadataRoundtrip>(
+    pub fn metadata<N: Into<crate::NodeId>, T: metadata::MetadataRoundtrip>(
         &'a self,
-        row: tsk_id_t,
+        row: N,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(self, row)?;
+        let buffer = metadata_to_vector!(self, row.into().0)?;
         decode_metadata_row!(T, buffer)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -141,11 +141,11 @@ impl<'a> NodeTable<'a> {`
`141`	`141`	`unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_.individual)`
`142`	`142`	`}`
`143`	`143`
`144`		`- pub fn metadata<T: metadata::MetadataRoundtrip>(`
	`144`	`+ pub fn metadata<N: Into<crate::NodeId>, T: metadata::MetadataRoundtrip>(`
`145`	`145`	`&'a self,`
`146`		`- row: tsk_id_t,`
	`146`	`+ row: N,`
`147`	`147`	`) -> Result<Option<T>, TskitError> {`
`148`		`- let buffer = metadata_to_vector!(self, row)?;`
	`148`	`+ let buffer = metadata_to_vector!(self, row.into().0)?;`
`149`	`149`	`decode_metadata_row!(T, buffer)`
`150`	`150`	`}`
`151`	`151`