Skip to content

Commit 12569ea

Browse files
committed
style: Deprecate "OwningX" type aliases for tables.
1 parent fbe5b2f commit 12569ea

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

src/lib.rs

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,30 @@ use bindings::tsk_size_t;
119119
pub(crate) const TSK_NULL: tsk_id_t = -1;
120120

121121
pub use edge_differences::*;
122-
pub use edge_table::{EdgeTable, EdgeTableRow, OwningEdgeTable};
122+
#[deprecated(since = "0.13.2", note = "use EdgeTable instead")]
123+
pub use edge_table::OwningEdgeTable;
124+
pub use edge_table::{EdgeTable, EdgeTableRow};
123125
pub use error::TskitError;
124126
pub use flags::*;
125-
pub use individual_table::{IndividualTable, IndividualTableRow, OwningIndividualTable};
126-
pub use migration_table::{MigrationTable, MigrationTableRow, OwningMigrationTable};
127-
pub use mutation_table::{MutationTable, MutationTableRow, OwningMutationTable};
127+
#[deprecated(since = "0.13.2", note = "use IndividualTable instead")]
128+
pub use individual_table::OwningIndividualTable;
129+
pub use individual_table::{IndividualTable, IndividualTableRow};
130+
#[deprecated(since = "0.13.2", note = "use MigrationTable instead")]
131+
pub use migration_table::OwningMigrationTable;
132+
pub use migration_table::{MigrationTable, MigrationTableRow};
133+
#[deprecated(since = "0.13.2", note = "use MutationTable instead")]
134+
pub use mutation_table::OwningMutationTable;
135+
pub use mutation_table::{MutationTable, MutationTableRow};
128136
pub use newtypes::*;
129-
pub use node_table::{
130-
NodeDefaults, NodeDefaultsWithMetadata, NodeTable, NodeTableRow, OwningNodeTable,
131-
};
132-
pub use population_table::{OwningPopulationTable, PopulationTable, PopulationTableRow};
133-
pub use site_table::{OwningSiteTable, SiteTable, SiteTableRow};
137+
#[deprecated(since = "0.13.2", note = "use NodeTable instead")]
138+
pub use node_table::OwningNodeTable;
139+
pub use node_table::{NodeDefaults, NodeDefaultsWithMetadata, NodeTable, NodeTableRow};
140+
#[deprecated(since = "0.13.2", note = "use PopulationTable instead")]
141+
pub use population_table::OwningPopulationTable;
142+
pub use population_table::{PopulationTable, PopulationTableRow};
143+
#[deprecated(since = "0.13.2", note = "use SiteTable instead")]
144+
pub use site_table::OwningSiteTable;
145+
pub use site_table::{SiteTable, SiteTableRow};
134146
pub use table_collection::TableCollection;
135147
pub use traits::IndividualLocation;
136148
pub use traits::IndividualParents;

src/provenance.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ impl Default for ProvenanceTable {
324324
}
325325
}
326326

327+
#[deprecated(since = "0.13.2", note = "use ProvenanceTable instead")]
327328
pub type OwningProvenanceTable = ProvenanceTable;
328329

329330
#[cfg(test)]

0 commit comments

Comments
 (0)