@@ -46,7 +46,7 @@ macro_rules! unsafe_tsk_column_access {
46
46
47
47
macro_rules! unsafe_tsk_ragged_column_access {
48
48
( $i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr) => { {
49
- let i = crate :: SizeType :: try_from( $i) ?;
49
+ let i = $ crate:: SizeType :: try_from( $i) ?;
50
50
if $i < $lo || i >= $hi {
51
51
Err ( TskitError :: IndexError { } )
52
52
} else if $offset_array_len == 0 {
@@ -71,7 +71,7 @@ macro_rules! unsafe_tsk_ragged_column_access {
71
71
} } ;
72
72
73
73
( $i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr, $output_id_type: expr) => { {
74
- let i = crate :: SizeType :: try_from( $i) ?;
74
+ let i = $ crate:: SizeType :: try_from( $i) ?;
75
75
if $i < $lo || i >= $hi {
76
76
Err ( TskitError :: IndexError { } )
77
77
} else if $offset_array_len == 0 {
@@ -101,7 +101,7 @@ macro_rules! unsafe_tsk_ragged_column_access {
101
101
#[ allow( unused_macros) ]
102
102
macro_rules! unsafe_tsk_ragged_char_column_access {
103
103
( $i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr) => { {
104
- let i = crate :: SizeType :: try_from( $i) ?;
104
+ let i = $ crate:: SizeType :: try_from( $i) ?;
105
105
if $i < $lo || i >= $hi {
106
106
Err ( TskitError :: IndexError { } )
107
107
} else if $offset_array_len == 0 {
@@ -301,11 +301,11 @@ macro_rules! impl_id_traits {
301
301
}
302
302
}
303
303
304
- impl TryFrom <$idtype> for crate :: SizeType {
305
- type Error = crate :: TskitError ;
304
+ impl TryFrom <$idtype> for $ crate:: SizeType {
305
+ type Error = $ crate:: TskitError ;
306
306
307
307
fn try_from( value: $idtype) -> Result <Self , Self :: Error > {
308
- crate :: SizeType :: try_from( value. 0 )
308
+ $ crate:: SizeType :: try_from( value. 0 )
309
309
}
310
310
}
311
311
@@ -337,28 +337,28 @@ macro_rules! impl_id_traits {
337
337
338
338
macro_rules! impl_size_type_comparisons_for_row_ids {
339
339
( $idtype: ty) => {
340
- impl PartialEq <$idtype> for crate :: SizeType {
340
+ impl PartialEq <$idtype> for $ crate:: SizeType {
341
341
fn eq( & self , other: & $idtype) -> bool {
342
- self . 0 == other. 0 as crate :: bindings:: tsk_size_t
342
+ self . 0 == other. 0 as $ crate:: bindings:: tsk_size_t
343
343
}
344
344
}
345
345
346
- impl PartialEq <crate :: SizeType > for $idtype {
347
- fn eq( & self , other: & crate :: SizeType ) -> bool {
348
- ( self . 0 as crate :: bindings:: tsk_size_t) == other. 0
346
+ impl PartialEq <$ crate:: SizeType > for $idtype {
347
+ fn eq( & self , other: & $ crate:: SizeType ) -> bool {
348
+ ( self . 0 as $ crate:: bindings:: tsk_size_t) == other. 0
349
349
}
350
350
}
351
351
352
- impl PartialOrd <$idtype> for crate :: SizeType {
352
+ impl PartialOrd <$idtype> for $ crate:: SizeType {
353
353
fn partial_cmp( & self , other: & $idtype) -> Option <std:: cmp:: Ordering > {
354
354
self . 0
355
- . partial_cmp( & ( other. 0 as crate :: bindings:: tsk_size_t) )
355
+ . partial_cmp( & ( other. 0 as $ crate:: bindings:: tsk_size_t) )
356
356
}
357
357
}
358
358
359
- impl PartialOrd <crate :: SizeType > for $idtype {
360
- fn partial_cmp( & self , other: & crate :: SizeType ) -> Option <std:: cmp:: Ordering > {
361
- ( self . 0 as crate :: bindings:: tsk_size_t) . partial_cmp( & other. 0 )
359
+ impl PartialOrd <$ crate:: SizeType > for $idtype {
360
+ fn partial_cmp( & self , other: & $ crate:: SizeType ) -> Option <std:: cmp:: Ordering > {
361
+ ( self . 0 as $ crate:: bindings:: tsk_size_t) . partial_cmp( & other. 0 )
362
362
}
363
363
}
364
364
} ;
0 commit comments