diff --git a/src/edge_table.rs b/src/edge_table.rs index 178d4346d..eb4dec685 100644 --- a/src/edge_table.rs +++ b/src/edge_table.rs @@ -345,9 +345,9 @@ build_owned_table_type!( /// # Examples /// /// ``` - /// use tskit::OwnedEdgeTable; + /// use tskit::OwningEdgeTable; /// - /// let mut edges = OwnedEdgeTable::default(); + /// let mut edges = OwningEdgeTable::default(); /// let rowid = edges.add_row(1., 2., 0, 1).unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(edges.num_rows(), 1); @@ -361,7 +361,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { - /// use tskit::OwnedEdgeTable; + /// use tskit::OwningEdgeTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -373,7 +373,7 @@ build_owned_table_type!( /// /// let metadata = EdgeMetadata{value: 42}; /// - /// let mut edges = OwnedEdgeTable::default(); + /// let mut edges = OwningEdgeTable::default(); /// /// let rowid = edges.add_row_with_metadata(0., 1., 5, 10, &metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -387,7 +387,7 @@ build_owned_table_type!( /// } /// # } /// ``` - => OwnedEdgeTable, + => OwningEdgeTable, EdgeTable, tsk_edge_table_t, tsk_edge_table_init, @@ -395,7 +395,7 @@ build_owned_table_type!( crate::bindings::tsk_edge_table_clear ); -impl OwnedEdgeTable { +impl OwningEdgeTable { edge_table_add_row!(=> add_row, self, *self.table); edge_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table); } diff --git a/src/individual_table.rs b/src/individual_table.rs index 2bfdff17b..a995cff84 100644 --- a/src/individual_table.rs +++ b/src/individual_table.rs @@ -459,9 +459,9 @@ build_owned_table_type!( /// # Examples /// /// ``` - /// use tskit::OwnedIndividualTable; + /// use tskit::OwningIndividualTable; /// - /// let mut individuals = OwnedIndividualTable::default(); + /// let mut individuals = OwningIndividualTable::default(); /// let rowid = individuals.add_row(0, None, None).unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(individuals.num_rows(), 1); @@ -473,7 +473,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { - /// use tskit::OwnedIndividualTable; + /// use tskit::OwningIndividualTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -485,7 +485,7 @@ build_owned_table_type!( /// /// let metadata = IndividualMetadata{value: 42}; /// - /// let mut individuals = OwnedIndividualTable::default(); + /// let mut individuals = OwningIndividualTable::default(); /// /// let rowid = individuals.add_row_with_metadata(0, None, None, &metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -500,7 +500,7 @@ build_owned_table_type!( /// /// # } /// ``` - => OwnedIndividualTable, + => OwningIndividualTable, IndividualTable, tsk_individual_table_t, tsk_individual_table_init, @@ -508,7 +508,7 @@ build_owned_table_type!( crate::bindings::tsk_individual_table_clear ); -impl OwnedIndividualTable { +impl OwningIndividualTable { individual_table_add_row!(=> add_row, self, *self.table); individual_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table); } diff --git a/src/lib.rs b/src/lib.rs index 40138b398..1b283d54d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -427,15 +427,15 @@ impl_time_position_arithmetic!(Position, Time); /// "Null" identifier value. pub(crate) const TSK_NULL: tsk_id_t = -1; -pub use edge_table::{EdgeTable, EdgeTableRow, OwnedEdgeTable}; +pub use edge_table::{EdgeTable, EdgeTableRow, OwningEdgeTable}; pub use error::TskitError; pub use flags::*; -pub use individual_table::{IndividualTable, IndividualTableRow, OwnedIndividualTable}; -pub use migration_table::{MigrationTable, MigrationTableRow, OwnedMigrationTable}; -pub use mutation_table::{MutationTable, MutationTableRow, OwnedMutationTable}; -pub use node_table::{NodeTable, NodeTableRow, OwnedNodeTable}; -pub use population_table::{OwnedPopulationTable, PopulationTable, PopulationTableRow}; -pub use site_table::{OwnedSiteTable, SiteTable, SiteTableRow}; +pub use individual_table::{IndividualTable, IndividualTableRow, OwningIndividualTable}; +pub use migration_table::{MigrationTable, MigrationTableRow, OwningMigrationTable}; +pub use mutation_table::{MutationTable, MutationTableRow, OwningMutationTable}; +pub use node_table::{NodeTable, NodeTableRow, OwningNodeTable}; +pub use population_table::{OwningPopulationTable, PopulationTable, PopulationTableRow}; +pub use site_table::{OwningSiteTable, SiteTable, SiteTableRow}; pub use table_collection::TableCollection; pub use traits::IndividualLocation; pub use traits::IndividualParents; diff --git a/src/migration_table.rs b/src/migration_table.rs index cc1d04b15..24d8f624e 100644 --- a/src/migration_table.rs +++ b/src/migration_table.rs @@ -410,9 +410,9 @@ build_owned_table_type!( /// # Examples /// /// ``` - /// use tskit::OwnedMigrationTable; + /// use tskit::OwningMigrationTable; /// - /// let mut migrations = OwnedMigrationTable::default(); + /// let mut migrations = OwningMigrationTable::default(); /// let rowid = migrations.add_row((0., 1.), 1, (0, 1), 10.3).unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(migrations.num_rows(), 1); @@ -423,7 +423,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { - /// use tskit::OwnedMigrationTable; + /// use tskit::OwningMigrationTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -435,7 +435,7 @@ build_owned_table_type!( /// /// let metadata = MigrationMetadata{value: 42}; /// - /// let mut migrations = OwnedMigrationTable::default(); + /// let mut migrations = OwningMigrationTable::default(); /// /// let rowid = migrations.add_row_with_metadata((0., 1.), 1, (0, 1), 10.3, &metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -450,7 +450,7 @@ build_owned_table_type!( /// /// # } /// ``` - => OwnedMigrationTable, + => OwningMigrationTable, MigrationTable, tsk_migration_table_t, tsk_migration_table_init, @@ -458,7 +458,7 @@ build_owned_table_type!( ll_bindings::tsk_migration_table_clear ); -impl OwnedMigrationTable { +impl OwningMigrationTable { migration_table_add_row!(=> add_row, self, *self.table); migration_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table); } diff --git a/src/mutation_table.rs b/src/mutation_table.rs index 12f7060d9..03c78d6f9 100644 --- a/src/mutation_table.rs +++ b/src/mutation_table.rs @@ -377,9 +377,9 @@ build_owned_table_type!( /// # Examples /// /// ``` -/// use tskit::OwnedMutationTable; +/// use tskit::OwningMutationTable; /// -/// let mut mutations = OwnedMutationTable::default(); +/// let mut mutations = OwningMutationTable::default(); /// let rowid = mutations.add_row(1, 2, 0, 1.0, None).unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(mutations.num_rows(), 1); @@ -390,7 +390,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { -/// use tskit::OwnedMutationTable; +/// use tskit::OwningMutationTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -402,7 +402,7 @@ build_owned_table_type!( /// /// let metadata = MutationMetadata{value: 42}; /// -/// let mut mutations = OwnedMutationTable::default(); +/// let mut mutations = OwningMutationTable::default(); /// /// let rowid = mutations.add_row_with_metadata(0, 1, 5, 10.0, None, &metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -416,7 +416,7 @@ build_owned_table_type!( /// } /// # } /// ``` - => OwnedMutationTable, + => OwningMutationTable, MutationTable, tsk_mutation_table_t, tsk_mutation_table_init, @@ -424,7 +424,7 @@ build_owned_table_type!( ll_bindings::tsk_mutation_table_clear ); -impl OwnedMutationTable { +impl OwningMutationTable { mutation_table_add_row!(=> add_row, self, *self.table); mutation_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table); } diff --git a/src/node_table.rs b/src/node_table.rs index e7b8abd4a..1a2252de7 100644 --- a/src/node_table.rs +++ b/src/node_table.rs @@ -514,13 +514,13 @@ impl NodeTable { /// # assert!(flags.iter().all(|f| f.is_sample())); /// ``` /// - /// ## Standalone tables + /// ## Owning tables /// /// The ownership semantics differ when tables are not part of a /// table collection: /// /// ``` - /// let mut nodes = tskit::OwnedNodeTable::default(); + /// let mut nodes = tskit::OwningNodeTable::default(); /// assert!(nodes.add_row(tskit::NodeFlags::IS_SAMPLE, 10., -1, -1).is_ok()); /// # assert_eq!(nodes.num_rows(), 1); /// let flags = nodes.flags_slice_mut(); @@ -565,9 +565,9 @@ build_owned_table_type!( /// # Examples /// /// ``` - /// use tskit::OwnedNodeTable; + /// use tskit::OwningNodeTable; /// - /// let mut nodes = OwnedNodeTable::default(); + /// let mut nodes = OwningNodeTable::default(); /// let rowid = nodes.add_row(0, 1.1, -1, -1).unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(nodes.num_rows(), 1); @@ -578,7 +578,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { - /// use tskit::OwnedNodeTable; + /// use tskit::OwningNodeTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -590,7 +590,7 @@ build_owned_table_type!( /// /// let metadata = NodeMetadata{value: 42}; /// - /// let mut nodes = OwnedNodeTable::default(); + /// let mut nodes = OwningNodeTable::default(); /// /// let rowid = nodes.add_row_with_metadata(0, 1., -1, -1, &metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -605,7 +605,7 @@ build_owned_table_type!( /// /// # } /// ``` - => OwnedNodeTable, + => OwningNodeTable, NodeTable, tsk_node_table_t, tsk_node_table_init, @@ -613,7 +613,7 @@ build_owned_table_type!( ll_bindings::tsk_node_table_clear ); -impl OwnedNodeTable { +impl OwningNodeTable { node_table_add_row!(=> add_row, self, (*self.table)); node_table_add_row_with_metadata!(=> add_row_with_metadata, self, (*self.table)); } @@ -624,7 +624,7 @@ mod test_owned_node_table { #[test] fn test_add_row() { - let mut nodes = OwnedNodeTable::default(); + let mut nodes = OwningNodeTable::default(); let rowid = nodes.add_row(0, 1.1, -1, -1).unwrap(); assert_eq!(rowid, 0); assert_eq!(nodes.num_rows(), 1); diff --git a/src/population_table.rs b/src/population_table.rs index b67084be6..10fa78a7b 100644 --- a/src/population_table.rs +++ b/src/population_table.rs @@ -223,9 +223,9 @@ build_owned_table_type!( /// # Examples /// /// ``` -/// use tskit::OwnedPopulationTable; +/// use tskit::OwningPopulationTable; /// -/// let mut populations = OwnedPopulationTable::default(); +/// let mut populations = OwningPopulationTable::default(); /// let rowid = populations.add_row().unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(populations.num_rows(), 1); @@ -236,7 +236,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { -/// use tskit::OwnedPopulationTable; +/// use tskit::OwningPopulationTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -248,7 +248,7 @@ build_owned_table_type!( /// /// let metadata = PopulationMetadata{name: "YRB".to_string()}; /// -/// let mut populations = OwnedPopulationTable::default(); +/// let mut populations = OwningPopulationTable::default(); /// /// let rowid = populations.add_row_with_metadata(&metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -262,7 +262,7 @@ build_owned_table_type!( /// } /// # } /// ``` - => OwnedPopulationTable, + => OwningPopulationTable, PopulationTable, tsk_population_table_t, tsk_population_table_init, @@ -270,7 +270,7 @@ build_owned_table_type!( ll_bindings::tsk_population_table_clear ); -impl OwnedPopulationTable { +impl OwningPopulationTable { population_table_add_row!(=> add_row, self, *self.table); population_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table); } diff --git a/src/provenance.rs b/src/provenance.rs index 80dcf38c3..5fbf9dab1 100644 --- a/src/provenance.rs +++ b/src/provenance.rs @@ -287,14 +287,14 @@ build_owned_table_type!( /// # #[cfg(feature = "provenance")] /// # #[cfg_attr(doc_cfg, doc(cfg(feature = "provenance")))] /// { - /// use tskit::provenance::OwnedProvenanceTable; - /// let mut provenances = OwnedProvenanceTable::default(); + /// use tskit::provenance::OwningProvenanceTable; + /// let mut provenances = OwningProvenanceTable::default(); /// let id = provenances.add_row("message").unwrap(); /// assert_eq!(id, 0); /// assert_eq!(provenances.num_rows(), 1); /// # } /// ``` - => OwnedProvenanceTable, + => OwningProvenanceTable, ProvenanceTable, tsk_provenance_table_t, tsk_provenance_table_init, @@ -302,7 +302,7 @@ build_owned_table_type!( ll_bindings::tsk_provenance_table_clear ); -impl OwnedProvenanceTable { +impl OwningProvenanceTable { provenance_table_add_row!(=> add_row, self, *self.table); } diff --git a/src/site_table.rs b/src/site_table.rs index 03f648dcf..b31fb3114 100644 --- a/src/site_table.rs +++ b/src/site_table.rs @@ -278,9 +278,9 @@ build_owned_table_type!( /// # Examples /// /// ``` - /// use tskit::OwnedSiteTable; + /// use tskit::OwningSiteTable; /// - /// let mut sites = OwnedSiteTable::default(); + /// let mut sites = OwningSiteTable::default(); /// let rowid = sites.add_row(1., None).unwrap(); /// assert_eq!(rowid, 0); /// assert_eq!(sites.num_rows(), 1); @@ -291,7 +291,7 @@ build_owned_table_type!( /// /// ``` /// # #[cfg(any(feature="doc", feature="derive"))] { - /// use tskit::OwnedSiteTable; + /// use tskit::OwningSiteTable; /// /// #[derive(serde::Serialize, /// serde::Deserialize, @@ -303,7 +303,7 @@ build_owned_table_type!( /// /// let metadata = SiteMetadata{value: 42}; /// - /// let mut sites = OwnedSiteTable::default(); + /// let mut sites = OwningSiteTable::default(); /// /// let rowid = sites.add_row_with_metadata(0., None, &metadata).unwrap(); /// assert_eq!(rowid, 0); @@ -317,7 +317,7 @@ build_owned_table_type!( /// } /// # } /// ``` - => OwnedSiteTable, + => OwningSiteTable, SiteTable, tsk_site_table_t, tsk_site_table_init, @@ -325,7 +325,7 @@ build_owned_table_type!( ll_bindings::tsk_site_table_clear ); -impl OwnedSiteTable { +impl OwningSiteTable { site_table_add_row!(=> add_row, self, *self.table); site_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table); } diff --git a/src/table_collection.rs b/src/table_collection.rs index ca9b41a1f..dd80d0218 100644 --- a/src/table_collection.rs +++ b/src/table_collection.rs @@ -925,7 +925,7 @@ impl TableCollection { /// ``` => add_provenance, self, self.inner.provenances); - /// Set the edge table from an [`OwnedEdgeTable`](`crate::OwnedEdgeTable`) + /// Set the edge table from an [`OwningEdgeTable`](`crate::OwningEdgeTable`) /// /// # Errors /// @@ -936,7 +936,7 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut edges = tskit::OwnedEdgeTable::default(); + /// let mut edges = tskit::OwningEdgeTable::default(); /// edges.add_row(0., 1., 0, 12).unwrap(); /// tables.set_edges(&edges).unwrap(); /// assert_eq!(tables.edges().num_rows(), 1); @@ -944,7 +944,7 @@ impl TableCollection { /// # edges.clear().unwrap(); /// # assert_eq!(edges.num_rows(), 0); /// ``` - pub fn set_edges(&mut self, edges: &crate::OwnedEdgeTable) -> TskReturnValue { + pub fn set_edges(&mut self, edges: &crate::OwningEdgeTable) -> TskReturnValue { // SAFETY: neither self nor edges are possible // to create with null pointers. let rv = unsafe { @@ -962,7 +962,7 @@ impl TableCollection { handle_tsk_return_value!(rv) } - /// Set the node table from an [`OwnedNodeTable`](`crate::OwnedNodeTable`) + /// Set the node table from an [`OwningNodeTable`](`crate::OwningNodeTable`) /// /// # Errors /// @@ -973,7 +973,7 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut nodes = tskit::OwnedNodeTable::default(); + /// let mut nodes = tskit::OwningNodeTable::default(); /// nodes.add_row(0, 10.0, -1, -1).unwrap(); /// tables.set_nodes(&nodes).unwrap(); /// assert_eq!(tables.nodes().num_rows(), 1); @@ -981,7 +981,7 @@ impl TableCollection { /// # nodes.clear().unwrap(); /// # assert_eq!(nodes.num_rows(), 0); /// ``` - pub fn set_nodes(&mut self, nodes: &crate::OwnedNodeTable) -> TskReturnValue { + pub fn set_nodes(&mut self, nodes: &crate::OwningNodeTable) -> TskReturnValue { // SAFETY: neither self nor nodes are possible // to create with null pointers. let rv = unsafe { @@ -999,7 +999,7 @@ impl TableCollection { handle_tsk_return_value!(rv) } - /// Set the site table from an [`OwnedSiteTable`](`crate::OwnedSiteTable`) + /// Set the site table from an [`OwningSiteTable`](`crate::OwningSiteTable`) /// /// # Errors /// @@ -1010,7 +1010,7 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut sites = tskit::OwnedSiteTable::default(); + /// let mut sites = tskit::OwningSiteTable::default(); /// sites.add_row(11.0, None).unwrap(); /// tables.set_sites(&sites).unwrap(); /// assert_eq!(tables.sites().num_rows(), 1); @@ -1018,7 +1018,7 @@ impl TableCollection { /// # sites.clear().unwrap(); /// # assert_eq!(sites.num_rows(), 0); /// ``` - pub fn set_sites(&mut self, sites: &crate::OwnedSiteTable) -> TskReturnValue { + pub fn set_sites(&mut self, sites: &crate::OwningSiteTable) -> TskReturnValue { // SAFETY: neither self nor nodes are possible // to create with null pointers. let rv = unsafe { @@ -1035,7 +1035,7 @@ impl TableCollection { handle_tsk_return_value!(rv) } - /// Set the mutation table from an [`OwnedMutationTable`](`crate::OwnedSiteTable`) + /// Set the mutation table from an [`OwningMutationTable`](`crate::OwningSiteTable`) /// /// # Errors /// @@ -1046,7 +1046,7 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut mutations = tskit::OwnedMutationTable::default(); + /// let mut mutations = tskit::OwningMutationTable::default(); /// mutations.add_row(14, 12, -1, 11.3, None).unwrap(); /// tables.set_mutations(&mutations).unwrap(); /// assert_eq!(tables.mutations().num_rows(), 1); @@ -1054,7 +1054,7 @@ impl TableCollection { /// # mutations.clear().unwrap(); /// # assert_eq!(mutations.num_rows(), 0); /// ``` - pub fn set_mutations(&mut self, mutations: &crate::OwnedMutationTable) -> TskReturnValue { + pub fn set_mutations(&mut self, mutations: &crate::OwningMutationTable) -> TskReturnValue { // SAFETY: neither self nor nodes are possible // to create with null pointers. let rv = unsafe { @@ -1074,7 +1074,7 @@ impl TableCollection { handle_tsk_return_value!(rv) } - /// Set the individual table from an [`OwnedIndividualTable`](`crate::OwnedSiteTable`) + /// Set the individual table from an [`OwningIndividualTable`](`crate::OwningSiteTable`) /// /// # Errors /// @@ -1085,7 +1085,7 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut individuals = tskit::OwnedIndividualTable::default(); + /// let mut individuals = tskit::OwningIndividualTable::default(); /// individuals.add_row(0, [0.1, 10.0], None).unwrap(); /// tables.set_individuals(&individuals).unwrap(); /// assert_eq!(tables.individuals().num_rows(), 1); @@ -1094,7 +1094,10 @@ impl TableCollection { /// # individuals.clear().unwrap(); /// # assert_eq!(individuals.num_rows(), 0); /// ``` - pub fn set_individuals(&mut self, individuals: &crate::OwnedIndividualTable) -> TskReturnValue { + pub fn set_individuals( + &mut self, + individuals: &crate::OwningIndividualTable, + ) -> TskReturnValue { // SAFETY: neither self nor nodes are possible // to create with null pointers. let rv = unsafe { @@ -1113,7 +1116,7 @@ impl TableCollection { handle_tsk_return_value!(rv) } - /// Set the migration table from an [`OwnedMigrationTable`](`crate::OwnedSiteTable`) + /// Set the migration table from an [`OwningMigrationTable`](`crate::OwningSiteTable`) /// /// # Errors /// @@ -1124,7 +1127,7 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut migrations = tskit::OwnedMigrationTable::default(); + /// let mut migrations = tskit::OwningMigrationTable::default(); /// migrations.add_row((0.25, 0.37), 1, (0, 1), 111.0).unwrap(); /// tables.set_migrations(&migrations).unwrap(); /// assert_eq!(tables.migrations().num_rows(), 1); @@ -1132,7 +1135,7 @@ impl TableCollection { /// # migrations.clear().unwrap(); /// # assert_eq!(migrations.num_rows(), 0); /// ``` - pub fn set_migrations(&mut self, migrations: &crate::OwnedMigrationTable) -> TskReturnValue { + pub fn set_migrations(&mut self, migrations: &crate::OwningMigrationTable) -> TskReturnValue { // SAFETY: neither self nor edges are possible // to create with null pointers. let rv = unsafe { @@ -1152,7 +1155,7 @@ impl TableCollection { handle_tsk_return_value!(rv) } - /// Set the population table from an [`OwnedPopulationTable`](`crate::OwnedSiteTable`) + /// Set the population table from an [`OwningPopulationTable`](`crate::OwningSiteTable`) /// /// # Errors /// @@ -1163,14 +1166,17 @@ impl TableCollection { /// ```rust /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut populations = tskit::OwnedPopulationTable::default(); + /// let mut populations = tskit::OwningPopulationTable::default(); /// populations.add_row().unwrap(); /// tables.set_populations(&populations).unwrap(); /// assert_eq!(tables.populations().num_rows(), 1); /// # populations.clear().unwrap(); /// # assert_eq!(populations.num_rows(), 0); /// ``` - pub fn set_populations(&mut self, populations: &crate::OwnedPopulationTable) -> TskReturnValue { + pub fn set_populations( + &mut self, + populations: &crate::OwningPopulationTable, + ) -> TskReturnValue { // SAFETY: neither self nor edges are possible // to create with null pointers. let rv = unsafe { @@ -1187,7 +1193,7 @@ impl TableCollection { #[cfg(feature = "provenance")] #[cfg_attr(doc_cfg, doc(cfg(feature = "provenance")))] /// Set the provenance table from an - /// [`OwnedProvenanceTable`](`crate::provenance::OwnedProvenanceTable`) + /// [`OwningProvenanceTable`](`crate::provenance::OwningProvenanceTable`) /// /// # Errors /// @@ -1199,7 +1205,7 @@ impl TableCollection { /// # #[cfg(feature="provenance")] { /// # /// let mut tables = tskit::TableCollection::new(1.0).unwrap(); - /// let mut provenances = tskit::provenance::OwnedProvenanceTable::default(); + /// let mut provenances = tskit::provenance::OwningProvenanceTable::default(); /// provenances.add_row("I like pancakes").unwrap(); /// tables.set_provenances(&provenances).unwrap(); /// assert_eq!(tables.provenances().num_rows(), 1); @@ -1210,7 +1216,7 @@ impl TableCollection { /// ``` pub fn set_provenances( &mut self, - provenances: &crate::provenance::OwnedProvenanceTable, + provenances: &crate::provenance::OwningProvenanceTable, ) -> TskReturnValue { // SAFETY: neither self nor edges are possible // to create with null pointers.