sites, pt 2

Author: molpopgen

src/_macros.rs

@@ -914,6 +914,23 @@ macro_rules! site_table_add_row {
     };
 }
 
+macro_rules! site_table_add_row_with_metadata {
+    ($(#[$attr:meta])* => $name: ident, $self: ident, $table: expr) => {
+        $(#[$attr])*
+        pub fn $name<M>(&mut $self,
+                        position: impl Into<$crate::Position>,
+                        ancestral_state: Option<&[u8]>,
+                        metadata: &M) -> Result<$crate::SiteId, $crate::TskitError>
+        where M: $crate::metadata::SiteMetadata {
+            let md = $crate::metadata::EncodedMetadata::new(metadata)?;
+            site_table_add_row_details!(position, ancestral_state,
+                                        md.as_ptr(),
+                                        md.len().into(),
+                                        $table)
+        }
+    };
+}
+
 #[cfg(test)]
 mod test {
     use crate::error::TskitError;

src/table_collection.rs

@@ -24,7 +24,7 @@ use crate::TreeSequenceFlags;
 use crate::TskReturnValue;
 use crate::TskitTypeAccess;
 use crate::{tsk_id_t, tsk_size_t};
-use crate::{EdgeId, MigrationId, NodeId, PopulationId, SiteId};
+use crate::{EdgeId, MigrationId, NodeId, PopulationId};
 use ll_bindings::tsk_table_collection_free;
 use mbox::MBox;
 
@@ -454,6 +454,7 @@ impl TableCollection {
     /// Add a row to the site table
     => add_site, self, (*self.inner).sites);
 
+    site_table_add_row_with_metadata!(
     /// Add a row with optional metadata to the site table
     ///
     /// # Examples
@@ -476,28 +477,7 @@ impl TableCollection {
     ///                                       &metadata).is_ok());
     /// # }
     /// ```
-    pub fn add_site_with_metadata<P: Into<Position>, M: SiteMetadata>(
-        &mut self,
-        position: P,
-        ancestral_state: Option<&[u8]>,
-        metadata: &M,
-    ) -> Result<SiteId, TskitError> {
-        let astate = process_state_input!(ancestral_state);
-        let md = EncodedMetadata::new(metadata)?;
-
-        let rv = unsafe {
-            ll_bindings::tsk_site_table_add_row(
-                &mut (*self.as_mut_ptr()).sites,
-                position.into().0,
-                astate.0,
-                astate.1,
-                md.as_ptr(),
-                md.len().into(),
-            )
-        };
-
-        handle_tsk_return_value!(rv, SiteId::from(rv))
-    }
+    => add_site_with_metadata, self, (*self.inner).sites);
 
     mutation_table_add_row!(
     /// Add a row to the mutation table.