diff --git a/fixed_wide/src/fixed.rs b/fixed_wide/src/fixed.rs index 1c1ca49..9ed0f1a 100644 --- a/fixed_wide/src/fixed.rs +++ b/fixed_wide/src/fixed.rs @@ -62,47 +62,47 @@ impl<const CHUNKS:usize,Frac> std::ops::Neg for Fixed<CHUNKS,Frac>{ macro_rules! impl_operator { ( $struct: ident, $trait: ident, $method: ident, $output: ty ) => { - impl<const CHUNKS:usize,Frac> core::ops::$trait for $struct<CHUNKS,Frac>{ - type Output = $output; + impl<const CHUNKS:usize,Frac> core::ops::$trait for $struct<CHUNKS,Frac>{ + type Output = $output; - fn $method(self, other: Self) -> Self::Output { - Self { - bits:self.bits.$method(other.bits), - frac:PhantomData, - } - } - } - impl<const CHUNKS:usize,Frac:Unsigned,U> core::ops::$trait<U> for $struct<CHUNKS,Frac> - where - BInt::<CHUNKS>:From<U>, - { - type Output = $output; + fn $method(self, other: Self) -> Self::Output { + Self { + bits:self.bits.$method(other.bits), + frac:PhantomData, + } + } + } + impl<const CHUNKS:usize,Frac:Unsigned,U> core::ops::$trait<U> for $struct<CHUNKS,Frac> + where + BInt::<CHUNKS>:From<U>, + { + type Output = $output; - fn $method(self, other: U) -> Self::Output { - Self { - bits:self.bits.$method(BInt::<CHUNKS>::from(other)<<Frac::U32), - frac:PhantomData, - } - } - } - }; + fn $method(self, other: U) -> Self::Output { + Self { + bits:self.bits.$method(BInt::<CHUNKS>::from(other)<<Frac::U32), + frac:PhantomData, + } + } + } + }; } macro_rules! impl_assign_operator { - ( $struct: ident, $trait: ident, $method: ident ) => { - impl<const CHUNKS:usize,Frac> core::ops::$trait for $struct<CHUNKS,Frac>{ - fn $method(&mut self, other: Self) { - self.bits.$method(other.bits); - } - } - impl<const CHUNKS:usize,Frac:Unsigned,U> core::ops::$trait<U> for $struct<CHUNKS,Frac> - where - BInt::<CHUNKS>:From<U>, - { - fn $method(&mut self, other: U) { - self.bits.$method(BInt::<CHUNKS>::from(other)<<Frac::U32); - } - } - }; + ( $struct: ident, $trait: ident, $method: ident ) => { + impl<const CHUNKS:usize,Frac> core::ops::$trait for $struct<CHUNKS,Frac>{ + fn $method(&mut self, other: Self) { + self.bits.$method(other.bits); + } + } + impl<const CHUNKS:usize,Frac:Unsigned,U> core::ops::$trait<U> for $struct<CHUNKS,Frac> + where + BInt::<CHUNKS>:From<U>, + { + fn $method(&mut self, other: U) { + self.bits.$method(BInt::<CHUNKS>::from(other)<<Frac::U32); + } + } + }; } // Impl arithmetic pperators @@ -127,26 +127,26 @@ impl_operator!( Fixed, BitXor, bitxor, Self ); macro_rules! impl_shift_operator { ( $struct: ident, $trait: ident, $method: ident, $output: ty ) => { - impl<const CHUNKS:usize,Frac> core::ops::$trait<u32> for $struct<CHUNKS,Frac>{ - type Output = $output; + impl<const CHUNKS:usize,Frac> core::ops::$trait<u32> for $struct<CHUNKS,Frac>{ + type Output = $output; - fn $method(self, other: u32) -> Self::Output { - Self { - bits:self.bits.$method(other), - frac:PhantomData, - } - } - } - }; + fn $method(self, other: u32) -> Self::Output { + Self { + bits:self.bits.$method(other), + frac:PhantomData, + } + } + } + }; } macro_rules! impl_shift_assign_operator { - ( $struct: ident, $trait: ident, $method: ident ) => { - impl<const CHUNKS:usize,Frac> core::ops::$trait<u32> for $struct<CHUNKS,Frac>{ - fn $method(&mut self, other: u32) { - self.bits.$method(other); - } - } - }; + ( $struct: ident, $trait: ident, $method: ident ) => { + impl<const CHUNKS:usize,Frac> core::ops::$trait<u32> for $struct<CHUNKS,Frac>{ + fn $method(&mut self, other: u32) { + self.bits.$method(other); + } + } + }; } impl_shift_assign_operator!( Fixed, ShlAssign, shl_assign ); impl_shift_operator!( Fixed, Shl, shl, Self );