From 91a417366965f5f2d0b6ddff85ab22ba527ca87d Mon Sep 17 00:00:00 2001 From: Trevor Spiteri Date: Thu, 31 Jan 2019 02:57:55 +0100 Subject: [PATCH] remove unneeded functions --- src/lib.rs | 6 +++--- src/sealed_float.rs | 6 ------ src/sealed_int.rs | 11 ----------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 03e2cff..afcfef4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1537,10 +1537,10 @@ assert_eq!(Fix::saturating_from_float(f64::NEG_INFINITY), Fix::min_value()); if val.is_nan() { panic!("NaN"); } - let saturated = if val.is_sign_positive() { - Self::max_value() - } else { + let saturated = if val.is_sign_negative() { Self::min_value() + } else { + Self::max_value() }; if !val.is_finite() { return saturated; diff --git a/src/sealed_float.rs b/src/sealed_float.rs index 790721d..da0a9e6 100644 --- a/src/sealed_float.rs +++ b/src/sealed_float.rs @@ -34,7 +34,6 @@ pub trait SealedFloat: Copy + Debug + Display { fn is_nan(self) -> bool; fn is_finite(self) -> bool; fn is_zero(self) -> bool; - fn is_sign_positive(self) -> bool; fn is_sign_negative(self) -> bool; fn parts(self) -> (bool, i32, Self::Bits); @@ -80,11 +79,6 @@ macro_rules! sealed_float { (self.to_bits() & !Self::SIGN_MASK) == 0 } - #[inline] - fn is_sign_positive(self) -> bool { - (self.to_bits() & Self::SIGN_MASK) == 0 - } - #[inline] fn is_sign_negative(self) -> bool { (self.to_bits() & Self::SIGN_MASK) != 0 diff --git a/src/sealed_int.rs b/src/sealed_int.rs index 8411704..815b4d5 100644 --- a/src/sealed_int.rs +++ b/src/sealed_int.rs @@ -29,7 +29,6 @@ pub trait SealedInt: Copy + Ord + Debug + Display { fn one_shl(shift: u32) -> Self; fn all_ones_shl(shift: u32) -> Self; fn is_zero(self) -> bool; - fn is_positive(self) -> bool; fn is_negative(self) -> bool; fn to_fixed_overflow( @@ -67,11 +66,6 @@ macro_rules! sealed_int { self == 0 } - #[inline] - fn is_positive(self) -> bool { - self > 0 - } - $($rest)* } }; @@ -221,11 +215,6 @@ impl SealedInt for bool { !self } - #[inline] - fn is_positive(self) -> bool { - self - } - #[inline] fn is_negative(self) -> bool { false