timw4mail/rusty-numbers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify PortalOrd macro
Some checks failed
timw4mail/rusty-numbers/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Timothy Warren 2020-05-05 18:49:19 -04:00
parent e54485f12b
commit cf262073dd
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/bigint.rs
View File

@ -489,34 +489,32 @@ macro_rules! impl_from_larger {
} }
macro_rules! impl_ord_literal { macro_rules! impl_ord_literal {
($(($($prim: ty),+), $base: ty), *) => { ($($prim: ty),+) => {
$( $(
$( impl PartialEq<$prim> for BigInt {
impl PartialEq<$prim> for BigInt { fn eq(&self, other: &$prim) -> bool {
fn eq(&self, other: &$prim) -> bool { self == &BigInt::from(*other)
self == &BigInt::from(*other)
}
} }
}
impl PartialEq<BigInt> for $prim { impl PartialEq<BigInt> for $prim {
fn eq(&self, other: &BigInt) -> bool { fn eq(&self, other: &BigInt) -> bool {
&BigInt::from(*self) == other &BigInt::from(*self) == other
}
} }
}
impl PartialOrd<$prim> for BigInt { impl PartialOrd<$prim> for BigInt {
fn partial_cmp(&self, other: &$prim) -> Option<Ordering> { fn partial_cmp(&self, other: &$prim) -> Option<Ordering> {
self.partial_cmp(&BigInt::from(*other)) self.partial_cmp(&BigInt::from(*other))
}
} }
}
impl PartialOrd<BigInt> for $prim { impl PartialOrd<BigInt> for $prim {
fn partial_cmp(&self, other: &BigInt) -> Option<Ordering> { fn partial_cmp(&self, other: &BigInt) -> Option<Ordering> {
(&BigInt::from(*self)).partial_cmp(other) (&BigInt::from(*self)).partial_cmp(other)
}
} }
)+ }
)* )+
}; };
} }
@ -524,19 +522,14 @@ macro_rules! impl_ord_literal {
impl_from_larger!((i64, u64), (i128, u128)); impl_from_larger!((i64, u64), (i128, u128));
#[cfg(target_pointer_width = "32")] #[cfg(target_pointer_width = "32")]
impl_from_smaller!((i8, u8), (i16, u16), (i32, u32)); impl_from_smaller!((i8, u8), (i16, u16), (i32, u32));
#[cfg(target_pointer_width = "32")]
impl_ord_literal!((i8,u8,i16,u16,i32,u32,i64,u64), u32);
#[cfg(target_pointer_width = "32")]
static BITS: usize = 32;
#[cfg(target_pointer_width = "64")] #[cfg(target_pointer_width = "64")]
impl_from_larger!((i128, u128)); impl_from_larger!((i128, u128));
#[cfg(target_pointer_width = "64")] #[cfg(target_pointer_width = "64")]
impl_from_smaller!((i8, u8), (i16, u16), (i32, u32), (i64, u64)); impl_from_smaller!((i8, u8), (i16, u16), (i32, u32), (i64, u64));
#[cfg(target_pointer_width = "64")]
impl_ord_literal!((i8,u8,i16,u16,i32,u32,i64,u64), u32); // Implement PartialEq and PartialOrd to compare against BigInt values
#[cfg(target_pointer_width = "64")] impl_ord_literal!(i8,u8,i16,u16,i32,u32,i64,u64,i128,u128);
static BITS: usize = 64;
#[cfg(test)] #[cfg(test)]
#[cfg_attr(tarpaulin, skip)] #[cfg_attr(tarpaulin, skip)]