From a93585080c7fbf01d62c8e93569aeaa439eef538 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bennet=20Ble=C3=9Fmann?= Date: Fri, 5 Jul 2024 21:29:38 +0200 Subject: [PATCH] remove remains of num feature commit c41aba6b90d2b29f893394d34a80c774b4506d7a removed the num feature but a few cfgs remained --- src/arithmetic.rs | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/src/arithmetic.rs b/src/arithmetic.rs index 799dfbd6..747ef65d 100644 --- a/src/arithmetic.rs +++ b/src/arithmetic.rs @@ -545,26 +545,8 @@ impl PartialEq for Number { (&Number::Float(n1), Number::Integer(ref n2)) => { n1.eq(&OrderedFloat(n2.to_f64().value())) } - (Number::Integer(ref n1), Number::Rational(ref n2)) => { - #[cfg(feature = "num")] - { - &Rational::from(&**n1) == &**n2 - } - #[cfg(not(feature = "num"))] - { - n1.num_eq(&**n2) - } - } - (Number::Rational(ref n1), Number::Integer(ref n2)) => { - #[cfg(feature = "num")] - { - n1 == &Rational::from(&**n2) - } - #[cfg(not(feature = "num"))] - { - n1.num_eq(&**n2) - } - } + (Number::Integer(ref n1), Number::Rational(ref n2)) => n1.num_eq(&**n2), + (Number::Rational(ref n1), Number::Integer(ref n2)) => n1.num_eq(&**n2), (Number::Rational(ref n1), &Number::Float(n2)) => { OrderedFloat(n1.to_f64().value()).eq(&n2) } @@ -643,24 +625,10 @@ impl Ord for Number { n1.cmp(&OrderedFloat(n2.to_f64().value())) } (&Number::Integer(n1), &Number::Rational(n2)) => { - #[cfg(feature = "num")] - { - Rational::from(&**n1).cmp(n2) - } - #[cfg(not(feature = "num"))] - { - (*n1).num_partial_cmp(&*n2).unwrap_or(Ordering::Less) - } + (*n1).num_partial_cmp(&*n2).unwrap_or(Ordering::Less) } (&Number::Rational(n1), &Number::Integer(n2)) => { - #[cfg(feature = "num")] - { - (&**n1).cmp(&Rational::from(&**n2)) - } - #[cfg(not(feature = "num"))] - { - (*n1).num_partial_cmp(&*n2).unwrap_or(Ordering::Less) - } + (*n1).num_partial_cmp(&*n2).unwrap_or(Ordering::Less) } (&Number::Rational(n1), &Number::Float(n2)) => { OrderedFloat(n1.to_f64().value()).cmp(&n2) -- 2.54.0