complete replacement

Author: molpopgen

src/_macros.rs

@@ -27,41 +27,6 @@ macro_rules! panic_on_tskit_error {
     };
 }
 
-macro_rules! unsafe_tsk_column_access {
-    ($i: expr, $lo: expr, $hi: expr, $owner: expr, $array: ident) => {{
-        let x = $crate::tsk_id_t::from($i);
-        if x < $lo || (x as $crate::tsk_size_t) >= $hi {
-            None
-        } else {
-            debug_assert!(!($owner).$array.is_null());
-            if !$owner.$array.is_null() {
-                // SAFETY: array is not null
-                // and we did our best effort
-                // on bounds checking
-                Some(unsafe { *$owner.$array.offset(x as isize) })
-            } else {
-                None
-            }
-        }
-    }};
-    ($i: expr, $lo: expr, $hi: expr, $owner: expr, $array: ident, $output_id_type: ty) => {{
-        let x = $crate::tsk_id_t::from($i);
-        if x < $lo || (x as $crate::tsk_size_t) >= $hi {
-            None
-        } else {
-            debug_assert!(!($owner).$array.is_null());
-            if !$owner.$array.is_null() {
-                // SAFETY: array is not null
-                // and we did our best effort
-                // on bounds checking
-                unsafe { Some(<$output_id_type>::from(*($owner.$array.offset(x as isize)))) }
-            } else {
-                None
-            }
-        }
-    }};
-}
-
 macro_rules! unsafe_tsk_ragged_column_access {
     ($i: expr, $lo: expr, $hi: expr, $owner: expr, $array: ident, $offset_array: ident, $offset_array_len: ident, $output_id_type: ty) => {{
         let i = $crate::SizeType::try_from($i).ok()?;

src/migration_table.rs

@@ -262,11 +262,7 @@ impl MigrationTable {
     /// * `Some(time)` if `row` is valid.
     /// * `None` otherwise.
     pub fn time<M: Into<MigrationId> + Copy>(&self, row: M) -> Option<Time> {
-        sys::tsk_column_access::<Time, _, _, _>(
-            row.into(),
-            self.as_ref().time,
-            self.num_rows(),
-        )
+        sys::tsk_column_access::<Time, _, _, _>(row.into(), self.as_ref().time, self.num_rows())
     }
 
     /// Retrieve decoded metadata for a `row`.

src/tree_interface.rs

@@ -1,4 +1,5 @@
 use crate::bindings as ll_bindings;
+use crate::sys;
 use crate::tsk_id_t;
 use crate::tsk_size_t;
 use crate::NodeId;
@@ -297,15 +298,15 @@ impl TreeInterface {
     fn left_sample<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.num_nodes, ptr, left_sample, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.left_sample, self.num_nodes)
     }
 
     // error if we are not tracking samples,
     // Ok(None) if u is out of range
     fn right_sample<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.num_nodes, ptr, right_sample, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.right_sample, self.num_nodes)
     }
 
     /// Return the `[left, right)` coordinates of the tree.
@@ -330,7 +331,7 @@ impl TreeInterface {
     pub fn parent<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.array_len, ptr, parent, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.parent, self.array_len)
     }
 
     /// Get the left child of node `u`.
@@ -339,7 +340,7 @@ impl TreeInterface {
     pub fn left_child<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.array_len, ptr, left_child, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.left_child, self.array_len)
     }
 
     /// Get the right child of node `u`.
@@ -348,7 +349,7 @@ impl TreeInterface {
     pub fn right_child<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.array_len, ptr, right_child, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.right_child, self.array_len)
     }
 
     /// Get the left sib of node `u`.
@@ -357,7 +358,7 @@ impl TreeInterface {
     pub fn left_sib<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.array_len, ptr, left_sib, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.left_sib, self.array_len)
     }
 
     /// Get the right sib of node `u`.
@@ -366,7 +367,7 @@ impl TreeInterface {
     pub fn right_sib<N: Into<NodeId> + Copy>(&self, u: N) -> Option<NodeId> {
         // SAFETY: internal pointer cannot be NULL
         let ptr = unsafe { *self.as_ptr() };
-        unsafe_tsk_column_access!(u.into(), 0, self.array_len, ptr, right_sib, NodeId)
+        sys::tsk_column_access::<NodeId, _, _, _>(u.into(), ptr.right_sib, self.array_len)
     }
 
     /// Obtain the list of samples for the current tree/tree sequence