Skip to content

fix: replace crate with $crate in macros #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2022
Merged

fix: replace crate with $crate in macros #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: replace crate with $crate in macros
  • Loading branch information
@molpopgen
molpopgen committed Jul 20, 2022
commit d8e35df21329e9548f90d0ee4ccf7461dc0ed818
32 changes: 16 additions & 16 deletions src/_macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ macro_rules! unsafe_tsk_column_access {

macro_rules! unsafe_tsk_ragged_column_access {
($i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr) => {{
let i = crate::SizeType::try_from($i)?;
let i = $crate::SizeType::try_from($i)?;
if $i < $lo || i >= $hi {
Err(TskitError::IndexError {})
} else if $offset_array_len == 0 {
Expand All @@ -71,7 +71,7 @@ macro_rules! unsafe_tsk_ragged_column_access {
}};

($i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr, $output_id_type: expr) => {{
let i = crate::SizeType::try_from($i)?;
let i = $crate::SizeType::try_from($i)?;
if $i < $lo || i >= $hi {
Err(TskitError::IndexError {})
} else if $offset_array_len == 0 {
Expand Down Expand Up @@ -101,7 +101,7 @@ macro_rules! unsafe_tsk_ragged_column_access {
#[allow(unused_macros)]
macro_rules! unsafe_tsk_ragged_char_column_access {
($i: expr, $lo: expr, $hi: expr, $array: expr, $offset_array: expr, $offset_array_len: expr) => {{
let i = crate::SizeType::try_from($i)?;
let i = $crate::SizeType::try_from($i)?;
if $i < $lo || i >= $hi {
Err(TskitError::IndexError {})
} else if $offset_array_len == 0 {
Expand Down Expand Up @@ -301,11 +301,11 @@ macro_rules! impl_id_traits {
}
}

impl TryFrom<$idtype> for crate::SizeType {
type Error = crate::TskitError;
impl TryFrom<$idtype> for $crate::SizeType {
type Error = $crate::TskitError;

fn try_from(value: $idtype) -> Result<Self, Self::Error> {
crate::SizeType::try_from(value.0)
$crate::SizeType::try_from(value.0)
}
}

Expand Down Expand Up @@ -337,28 +337,28 @@ macro_rules! impl_id_traits {

macro_rules! impl_size_type_comparisons_for_row_ids {
($idtype: ty) => {
impl PartialEq<$idtype> for crate::SizeType {
impl PartialEq<$idtype> for $crate::SizeType {
fn eq(&self, other: &$idtype) -> bool {
self.0 == other.0 as crate::bindings::tsk_size_t
self.0 == other.0 as $crate::bindings::tsk_size_t
}
}

impl PartialEq<crate::SizeType> for $idtype {
fn eq(&self, other: &crate::SizeType) -> bool {
(self.0 as crate::bindings::tsk_size_t) == other.0
impl PartialEq<$crate::SizeType> for $idtype {
fn eq(&self, other: &$crate::SizeType) -> bool {
(self.0 as $crate::bindings::tsk_size_t) == other.0
}
}

impl PartialOrd<$idtype> for crate::SizeType {
impl PartialOrd<$idtype> for $crate::SizeType {
fn partial_cmp(&self, other: &$idtype) -> Option<std::cmp::Ordering> {
self.0
.partial_cmp(&(other.0 as crate::bindings::tsk_size_t))
.partial_cmp(&(other.0 as $crate::bindings::tsk_size_t))
}
}

impl PartialOrd<crate::SizeType> for $idtype {
fn partial_cmp(&self, other: &crate::SizeType) -> Option<std::cmp::Ordering> {
(self.0 as crate::bindings::tsk_size_t).partial_cmp(&other.0)
impl PartialOrd<$crate::SizeType> for $idtype {
fn partial_cmp(&self, other: &$crate::SizeType) -> Option<std::cmp::Ordering> {
(self.0 as $crate::bindings::tsk_size_t).partial_cmp(&other.0)
}
}
};
Expand Down