Merge pull request #56 from molpopgen/metadata_macro_fixes

Rework macros related to metadata.
tskit-dev · Apr 13, 2021 · 1823499 · 1823499
2 parents 45347a5 + 49bbd0f
commit 1823499
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/_macros.rs b/src/_macros.rs
@@ -94,14 +94,14 @@ macro_rules! build_consuming_tskit_type {
 }
 
 macro_rules! metadata_to_vector {
-    ($T: ty, $self: expr, $row: expr) => {
+    ($self: expr, $row: expr) => {
         crate::metadata::char_column_to_vector(
             $self.table_.metadata,
             $self.table_.metadata_offset,
             $row,
             $self.table_.num_rows,
             $self.table_.metadata_length,
-        )?
+        )
     };
 }
 

diff --git a/src/edge_table.rs b/src/edge_table.rs
@@ -65,7 +65,7 @@ impl<'a> EdgeTable<'a> {
         &'a self,
         row: tsk_id_t,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(T, self, row);
+        let buffer = metadata_to_vector!(self, row)?;
         decode_metadata_row!(T, buffer)
     }
 }
diff --git a/src/mutation_table.rs b/src/mutation_table.rs
@@ -85,7 +85,7 @@ impl<'a> MutationTable<'a> {
         &'a self,
         row: tsk_id_t,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(T, self, row);
+        let buffer = metadata_to_vector!(self, row)?;
         decode_metadata_row!(T, buffer)
     }
 }
diff --git a/src/node_table.rs b/src/node_table.rs
@@ -75,7 +75,7 @@ impl<'a> NodeTable<'a> {
         &'a self,
         row: tsk_id_t,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(T, self, row);
+        let buffer = metadata_to_vector!(self, row)?;
         decode_metadata_row!(T, buffer)
     }
 }
diff --git a/src/population_table.rs b/src/population_table.rs
@@ -26,7 +26,7 @@ impl<'a> PopulationTable<'a> {
         &'a self,
         row: tsk_id_t,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(T, self, row);
+        let buffer = metadata_to_vector!(self, row)?;
         decode_metadata_row!(T, buffer)
     }
 }
diff --git a/src/site_table.rs b/src/site_table.rs
@@ -56,7 +56,7 @@ impl<'a> SiteTable<'a> {
         &'a self,
         row: tsk_id_t,
     ) -> Result<Option<T>, TskitError> {
-        let buffer = metadata_to_vector!(T, self, row);
+        let buffer = metadata_to_vector!(self, row)?;
         decode_metadata_row!(T, buffer)
     }
 }