pinned traits streamline the interface

Author: molpopgen

src/node_table.rs

@@ -819,15 +819,15 @@ impl OwningNodeTable {
     /// ```
     /// # let mut nodes = tskit::OwningNodeTable::default();
     /// let node_defaults = tskit::NodeDefaults::default();
-    /// let rv = nodes.add_row_with_defaults(1.0, node_defaults).unwrap();
+    /// let rv = nodes.add_row_with_defaults(1.0, &node_defaults).unwrap();
     /// assert_eq!(rv, 0);
-    /// let rv = nodes.add_row_with_defaults(1.0, node_defaults).unwrap();
+    /// let rv = nodes.add_row_with_defaults(1.0, &node_defaults).unwrap();
     /// assert_eq!(rv, 1);
     /// ```
     pub fn add_row_with_defaults<T: Into<crate::Time> + Copy, D: DefaultNodeData>(
         &mut self,
         time: T,
-        defaults: D,
+        defaults: &D,
     ) -> Result<NodeId, TskitError> {
         let md = defaults.metadata()?;
         let (ptr, mdlen) = match &md {

src/table_collection.rs

@@ -5,7 +5,6 @@ use crate::bindings as ll_bindings;
 use crate::error::TskitError;
 use crate::types::Bookmark;
 use crate::IndividualTableSortOptions;
-use crate::NodeDefaults;
 use crate::Position;
 use crate::SimplificationOptions;
 use crate::TableClearOptions;
@@ -411,22 +410,43 @@ impl TableCollection {
     /// ```
     /// # let mut tables = tskit::TableCollection::new(1.).unwrap();
     /// let node_defaults = tskit::NodeDefaults::default();
-    /// let rv = tables.add_node_with_defaults(1.0, node_defaults).unwrap();
+    /// let rv = tables.add_node_with_defaults(1.0, &node_defaults).unwrap();
     /// assert_eq!(rv, 0);
-    /// let rv = tables.add_node_with_defaults(2.0, node_defaults).unwrap();
+    /// let rv = tables.add_node_with_defaults(2.0, &node_defaults).unwrap();
     /// assert_eq!(rv, 1);
     /// ```
-    pub fn add_node_with_defaults<T: Into<crate::Time> + Copy>(
+    pub fn add_node_with_defaults<
+        T: Into<crate::Time>,
+        D: crate::node_table::DefaultNodeData,
+    >(
         &mut self,
         time: T,
-        defaults: NodeDefaults,
+        defaults: &D,
     ) -> Result<NodeId, TskitError> {
-        self.add_node(
-            defaults.flags,
-            time,
-            defaults.population,
-            defaults.individual,
-        )
+        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()),
+        };
+        let flags: ll_bindings::tsk_flags_t = defaults.flags().bits();
+        let population: ll_bindings::tsk_id_t = defaults.population().into();
+        let individual: ll_bindings::tsk_id_t = defaults.individual().into();
+        let time: f64 = time.into().into();
+        let rv = unsafe {
+            ll_bindings::tsk_node_table_add_row(
+                &mut (*self.as_mut_ptr()).nodes,
+                flags,
+                time,
+                population,
+                individual,
+                ptr,
+                mdlen.into(),
+            )
+        };
+        handle_tsk_return_value!(rv, rv.into())
     }
 
     node_table_add_row_with_metadata!(