Skip to content

Commit f10286f

Browse files
authored
refactor: remove tsk_size_t (#507)
BREAKING CHANGE: Removed global constant from library
1 parent e9914e1 commit f10286f

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ pub mod types;
101101
mod util;
102102

103103
use bindings::tsk_id_t;
104-
use bindings::tsk_size_t;
105104

106105
// tskit defines this via a type cast
107106
// in a macro. bindgen thus misses it.

src/provenance.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
use crate::bindings as ll_bindings;
1414
use crate::sys;
1515
use crate::SizeType;
16-
use crate::{tsk_id_t, tsk_size_t, ProvenanceId};
16+
use crate::{tsk_id_t, ProvenanceId};
17+
use ll_bindings::tsk_size_t;
1718

1819
#[derive(Eq, Debug)]
1920
/// Row of a [`ProvenanceTable`].

src/sys/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ fn tsk_column_access_detail<R: Into<bindings::tsk_id_t>, L: Into<bindings::tsk_s
319319
) -> Option<T> {
320320
let row = row.into();
321321
let column_length = column_length.into();
322-
if row < 0 || (row as crate::tsk_size_t) >= column_length {
322+
if row < 0 || (row as crate::sys::bindings::tsk_size_t) >= column_length {
323323
None
324324
} else {
325325
assert!(!column.is_null());

src/table_collection.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use std::vec;
33

44
use crate::bindings as ll_bindings;
55
use crate::error::TskitError;
6+
use crate::tsk_id_t;
67
use crate::types::Bookmark;
78
use crate::IndividualTableSortOptions;
89
use crate::Position;
@@ -14,8 +15,8 @@ use crate::TableOutputOptions;
1415
use crate::TableSortOptions;
1516
use crate::TreeSequenceFlags;
1617
use crate::TskReturnValue;
17-
use crate::{tsk_id_t, tsk_size_t};
1818
use crate::{EdgeId, NodeId};
19+
use ll_bindings::tsk_size_t;
1920
use ll_bindings::tsk_table_collection_free;
2021
use mbox::MBox;
2122

src/tree_interface.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use crate::bindings as ll_bindings;
22
use crate::sys;
33
use crate::tsk_id_t;
4-
use crate::tsk_size_t;
54
use crate::NodeId;
65
use crate::Position;
76
use crate::SizeType;
87
use crate::Time;
98
use crate::TreeFlags;
109
use crate::TskitError;
10+
use ll_bindings::tsk_size_t;
1111
use std::ptr::NonNull;
1212

1313
pub struct TreeInterface {

0 commit comments

Comments
 (0)