Skip to content

Commit abe8d7d

Browse files
authored
style: Deprecate "OwningX" type aliases for tables. (#473)
1 parent fbe5b2f commit abe8d7d

9 files changed

+29
-9
lines changed

src/edge_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -441,4 +441,5 @@ impl Default for EdgeTable {
441441
}
442442
}
443443

444+
#[deprecated(since = "0.13.2", note = "use EdgeTable instead")]
444445
pub type OwningEdgeTable = EdgeTable;

src/individual_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -568,4 +568,5 @@ impl Default for IndividualTable {
568568
}
569569
}
570570

571+
#[deprecated(since = "0.13.2", note = "use IndividualTable instead")]
571572
pub type OwningIndividualTable = IndividualTable;

src/lib.rs

+21-9
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+
#[allow(deprecated)]
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+
#[allow(deprecated)]
128+
pub use individual_table::OwningIndividualTable;
129+
pub use individual_table::{IndividualTable, IndividualTableRow};
130+
#[allow(deprecated)]
131+
pub use migration_table::OwningMigrationTable;
132+
pub use migration_table::{MigrationTable, MigrationTableRow};
133+
#[allow(deprecated)]
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+
#[allow(deprecated)]
138+
pub use node_table::OwningNodeTable;
139+
pub use node_table::{NodeDefaults, NodeDefaultsWithMetadata, NodeTable, NodeTableRow};
140+
#[allow(deprecated)]
141+
pub use population_table::OwningPopulationTable;
142+
pub use population_table::{PopulationTable, PopulationTableRow};
143+
#[allow(deprecated)]
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/migration_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -509,4 +509,5 @@ impl Default for MigrationTable {
509509
}
510510
}
511511

512+
#[deprecated(since = "0.13.2", note = "use MigrationTable instead")]
512513
pub type OwningMigrationTable = MigrationTable;

src/mutation_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -489,4 +489,5 @@ impl Default for MutationTable {
489489
}
490490
}
491491

492+
#[deprecated(since = "0.13.2", note = "use MutationTable instead")]
492493
pub type OwningMutationTable = MutationTable;

src/node_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,7 @@ impl NodeTable {
971971
=> population, population_slice_raw, crate::tsk_id_t);
972972
}
973973

974+
#[deprecated(since = "0.13.2", note = "use NodeTable instead")]
974975
pub type OwningNodeTable = NodeTable;
975976

976977
impl Default for NodeTable {

src/population_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,5 @@ impl Default for PopulationTable {
300300
}
301301
}
302302

303+
#[deprecated(since = "0.13.2", note = "use PopulationTable instead")]
303304
pub type OwningPopulationTable = PopulationTable;

src/provenance.rs

+1
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)]

src/site_table.rs

+1
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,5 @@ impl Default for SiteTable {
376376
}
377377
}
378378

379+
#[deprecated(since = "0.13.2", note = "use SiteTable instead")]
379380
pub type OwningSiteTable = SiteTable;

0 commit comments

Comments
 (0)