all the tables

Author: molpopgen

src/provenance.rs

@@ -10,8 +10,6 @@
 //!   [`ProvenanceTable::iter`].
 //!
 
-use std::ptr::NonNull;
-
 use crate::bindings as ll_bindings;
 use crate::sys;
 use crate::SizeType;
@@ -141,23 +139,19 @@ impl<'a> streaming_iterator::StreamingIterator for ProvenanceTableRowView<'a> {
 ///
 #[derive(Debug)]
 pub struct ProvenanceTable {
-    table_: NonNull<ll_bindings::tsk_provenance_table_t>,
+    table_: sys::LLProvenanceTableRef,
 }
 
 impl ProvenanceTable {
     pub(crate) fn new_from_table(
         provenances: *mut ll_bindings::tsk_provenance_table_t,
     ) -> Result<Self, crate::TskitError> {
-        // FIXME: unwrap
-        let n = NonNull::new(provenances).ok_or_else(|| {
-            crate::TskitError::LibraryError("null pointer to tsk_provenance_table_t".to_string())
-        })?;
-        Ok(ProvenanceTable { table_: n })
+        let table_ = sys::LLProvenanceTableRef::new_from_table(provenances)?;
+        Ok(ProvenanceTable { table_ })
     }
 
     pub(crate) fn as_ref(&self) -> &ll_bindings::tsk_provenance_table_t {
-        // SAFETY: NonNull
-        unsafe { self.table_.as_ref() }
+        self.table_.as_ref()
     }
 
     /// Return the number of rows

src/sys.rs

@@ -8,6 +8,9 @@ use bindings::tsk_population_table_t;
 use bindings::tsk_site_table_t;
 use std::ptr::NonNull;
 
+#[cfg(feature = "provenance")]
+use bindings::tsk_provenance_table_t;
+
 macro_rules! basic_lltableref_impl {
     ($lltable: ident, $tsktable: ident) => {
         #[repr(transparent)]
@@ -41,6 +44,9 @@ basic_lltableref_impl!(LLMigrationTableRef, tsk_migration_table_t);
 basic_lltableref_impl!(LLPopulationTableRef, tsk_population_table_t);
 basic_lltableref_impl!(LLIndividualTableRef, tsk_individual_table_t);
 
+#[cfg(feature = "provenance")]
+basic_lltableref_impl!(LLProvenanceTableRef, tsk_provenance_table_t);
+
 fn tsk_column_access_detail<R: Into<bindings::tsk_id_t>, L: Into<bindings::tsk_size_t>, T: Copy>(
     row: R,
     column: *const T,