Skip to content

Commit 4aa41d3

Browse files
authored
fix: replace crate with $crate in macros (#287)
1 parent 36a8929 commit 4aa41d3

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/_macros.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ macro_rules! unsafe_tsk_column_access {
4646

4747
macro_rules! unsafe_tsk_ragged_column_access {
4848
($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)?;
5050
if $i < $lo || i >= $hi {
5151
Err(TskitError::IndexError {})
5252
} else if $offset_array_len == 0 {
@@ -71,7 +71,7 @@ macro_rules! unsafe_tsk_ragged_column_access {
7171
}};
7272

7373
($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)?;
7575
if $i < $lo || i >= $hi {
7676
Err(TskitError::IndexError {})
7777
} else if $offset_array_len == 0 {
@@ -101,7 +101,7 @@ macro_rules! unsafe_tsk_ragged_column_access {
101101
#[allow(unused_macros)]
102102
macro_rules! unsafe_tsk_ragged_char_column_access {
103103
($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)?;
105105
if $i < $lo || i >= $hi {
106106
Err(TskitError::IndexError {})
107107
} else if $offset_array_len == 0 {
@@ -301,11 +301,11 @@ macro_rules! impl_id_traits {
301301
}
302302
}
303303

304-
impl TryFrom<$idtype> for crate::SizeType {
305-
type Error = crate::TskitError;
304+
impl TryFrom<$idtype> for $crate::SizeType {
305+
type Error = $crate::TskitError;
306306

307307
fn try_from(value: $idtype) -> Result<Self, Self::Error> {
308-
crate::SizeType::try_from(value.0)
308+
$crate::SizeType::try_from(value.0)
309309
}
310310
}
311311

@@ -337,28 +337,28 @@ macro_rules! impl_id_traits {
337337

338338
macro_rules! impl_size_type_comparisons_for_row_ids {
339339
($idtype: ty) => {
340-
impl PartialEq<$idtype> for crate::SizeType {
340+
impl PartialEq<$idtype> for $crate::SizeType {
341341
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
343343
}
344344
}
345345

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
349349
}
350350
}
351351

352-
impl PartialOrd<$idtype> for crate::SizeType {
352+
impl PartialOrd<$idtype> for $crate::SizeType {
353353
fn partial_cmp(&self, other: &$idtype) -> Option<std::cmp::Ordering> {
354354
self.0
355-
.partial_cmp(&(other.0 as crate::bindings::tsk_size_t))
355+
.partial_cmp(&(other.0 as $crate::bindings::tsk_size_t))
356356
}
357357
}
358358

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)
362362
}
363363
}
364364
};

0 commit comments

Comments
 (0)