further dedup code

Author: molpopgen

src/node_table.rs

@@ -83,6 +83,30 @@ where
     )
 }
 
+pub(crate) fn add_row_with_defaults<T: Into<crate::Time>, D: crate::node_table::DefaultNodeData>(
+    time: T,
+    defaults: &D,
+    table: *mut ll_bindings::tsk_node_table_t,
+) -> Result<NodeId, TskitError> {
+    let md = defaults.metadata()?;
+    let (ptr, mdlen) = match &md {
+        Some(value) => (
+            value.as_ptr().cast::<i8>(),
+            crate::SizeType::try_from(value.len())?,
+        ),
+        None => (std::ptr::null(), 0.into()),
+    };
+    add_row_details(
+        defaults.flags().bits(),
+        time.into().into(),
+        defaults.population().into(),
+        defaults.individual().into(),
+        ptr,
+        mdlen.into(),
+        table,
+    )
+}
+
 /// Row of a [`NodeTable`]
 #[derive(Debug)]
 pub struct NodeTableRow {
@@ -943,23 +967,7 @@ impl OwningNodeTable {
         time: T,
         defaults: &D,
     ) -> Result<NodeId, TskitError> {
-        let md = defaults.metadata()?;
-        let (ptr, mdlen) = match &md {
-            Some(value) => (
-                value.as_ptr().cast::<i8>(),
-                SizeType::try_from(value.len())?,
-            ),
-            None => (std::ptr::null(), 0.into()),
-        };
-        add_row_details(
-            defaults.flags().bits(),
-            time.into().into(),
-            defaults.population().into(),
-            defaults.individual().into(),
-            ptr,
-            mdlen.into(),
-            self.as_mut_ptr(),
-        )
+        add_row_with_defaults(time, defaults, self.as_mut_ptr())
     }
 }
 

src/table_collection.rs

@@ -435,23 +435,9 @@ impl TableCollection {
         time: T,
         defaults: &D,
     ) -> Result<NodeId, TskitError> {
-        let md = defaults.metadata()?;
-        let (ptr, mdlen) = match &md {
-            Some(value) => (
-                value.as_ptr().cast::<i8>(),
-                crate::SizeType::try_from(value.len())?,
-            ),
-            None => (std::ptr::null(), 0.into()),
-        };
-        crate::node_table::add_row_details(
-            defaults.flags().bits(),
-            time.into().into(),
-            defaults.population().into(),
-            defaults.individual().into(),
-            ptr,
-            mdlen.into(),
-            unsafe { &mut (*self.as_mut_ptr()).nodes },
-        )
+        crate::node_table::add_row_with_defaults(time, defaults, unsafe {
+            &mut (*self.as_mut_ptr()).nodes
+        })
     }
 
     /// Add a row with optional metadata to the node table