abstract out common bits

Author: molpopgen

src/sys.rs

@@ -31,9 +31,7 @@ pub fn tsk_column_access<
     tsk_column_access_detail(row, column, column_length).map(|v| v.into())
 }
 
-pub fn tsk_ragged_column_access<
-    'a,
-    O,
+pub fn tsk_ragged_column_access_detail<
     R: Into<bindings::tsk_id_t>,
     L: Into<bindings::tsk_size_t>,
     T: Copy,
@@ -43,7 +41,7 @@ pub fn tsk_ragged_column_access<
     column_length: L,
     offset: *const bindings::tsk_size_t,
     offset_length: bindings::tsk_size_t,
-) -> Option<&'a [O]> {
+) -> Option<(*const T, usize)> {
     let row = row.into();
     let column_length = column_length.into();
     if row < 0 || row as bindings::tsk_size_t > column_length || offset_length == 0 {
@@ -61,12 +59,29 @@ pub fn tsk_ragged_column_access<
         if start == stop {
             None
         } else {
-            Some(unsafe {
-                std::slice::from_raw_parts(
-                    column.offset(start as isize).cast::<O>(),
-                    stop as usize - start as usize,
-                )
-            })
+            Some((
+                unsafe { column.offset(start as isize) },
+                stop as usize - start as usize,
+            ))
         }
     }
 }
+
+pub fn tsk_ragged_column_access<
+    'a,
+    O,
+    R: Into<bindings::tsk_id_t>,
+    L: Into<bindings::tsk_size_t>,
+    T: Copy,
+>(
+    row: R,
+    column: *const T,
+    column_length: L,
+    offset: *const bindings::tsk_size_t,
+    offset_length: bindings::tsk_size_t,
+) -> Option<&'a [O]> {
+    match tsk_ragged_column_access_detail(row, column, column_length, offset, offset_length) {
+        Some((p, n)) => Some(unsafe { std::slice::from_raw_parts(p.cast::<O>(), n) }),
+        None => None,
+    }
+}