More

Author: molpopgen

src/individual_table.rs

@@ -209,15 +209,7 @@ impl IndividualTable {
     /// * `Some(flags)` if `row` is valid.
     /// * `None` otherwise.
     pub fn flags<I: Into<IndividualId> + Copy>(&self, row: I) -> Option<IndividualFlags> {
-        assert!(self.num_rows() == 0 || !self.as_ref().flags.is_null());
-        // SAFETY: either the column is empty or the point is not NULL
-        unsafe {
-            sys::tsk_column_access::<IndividualFlags, _, _, _>(
-                row.into(),
-                self.as_ref().flags,
-                self.num_rows(),
-            )
-        }
+        self.table_.flags(row.into())
     }
 
     /// Return the locations for a given row.

src/sys/individual_table.rs

@@ -1,5 +1,8 @@
 use std::ptr::NonNull;
 
+use super::flags::IndividualFlags;
+use super::newtypes::IndividualId;
+
 use super::bindings::tsk_flags_t;
 use super::bindings::tsk_id_t;
 use super::bindings::tsk_individual_table_add_row;
@@ -66,6 +69,10 @@ impl IndividualTable {
             ))
         }
     }
+
+    pub fn flags(&self, row: IndividualId) -> Option<IndividualFlags> {
+        safe_tsk_column_access!(self, row, IndividualFlags, flags)
+    }
 }
 
 impl Default for IndividualTable {