fix all fixme #5527
This commit is contained in:
parent
8634d2fad6
commit
9d3db0e9ea
|
@ -5,21 +5,25 @@ use std::num::Wrapping;
|
|||
|
||||
/// Numbers which have upper and lower bounds
|
||||
pub trait Bounded {
|
||||
// FIXME (#5527): These should be associated constants
|
||||
/// returns the smallest finite number this type can represent
|
||||
fn min_value() -> Self;
|
||||
const MIN: Self;
|
||||
#[inline]
|
||||
fn min_value() -> Self where Self: Sized {
|
||||
Self::MIN
|
||||
}
|
||||
/// returns the largest finite number this type can represent
|
||||
fn max_value() -> Self;
|
||||
const MAX: Self;
|
||||
#[inline]
|
||||
fn max_value() -> Self where Self: Sized {
|
||||
Self::MAX
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! bounded_impl {
|
||||
($t:ty, $min:expr, $max:expr) => {
|
||||
impl Bounded for $t {
|
||||
#[inline]
|
||||
fn min_value() -> $t { $min }
|
||||
|
||||
#[inline]
|
||||
fn max_value() -> $t { $max }
|
||||
const MIN: $t = $min;
|
||||
const MAX: $t = $max;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -37,8 +41,9 @@ bounded_impl!(i32, i32::MIN, i32::MAX);
|
|||
bounded_impl!(i64, i64::MIN, i64::MAX);
|
||||
|
||||
impl<T: Bounded> Bounded for Wrapping<T> {
|
||||
fn min_value() -> Self { Wrapping(T::min_value()) }
|
||||
fn max_value() -> Self { Wrapping(T::max_value()) }
|
||||
|
||||
const MIN: Self = Wrapping(T::MIN);
|
||||
const MAX: Self = Wrapping(T::MAX);
|
||||
}
|
||||
|
||||
bounded_impl!(f32, f32::MIN, f32::MAX);
|
||||
|
@ -61,14 +66,8 @@ macro_rules! for_each_tuple {
|
|||
macro_rules! bounded_tuple {
|
||||
( $($name:ident)* ) => (
|
||||
impl<$($name: Bounded,)*> Bounded for ($($name,)*) {
|
||||
#[inline]
|
||||
fn min_value() -> Self {
|
||||
($($name::min_value(),)*)
|
||||
}
|
||||
#[inline]
|
||||
fn max_value() -> Self {
|
||||
($($name::max_value(),)*)
|
||||
}
|
||||
const MIN: Self = ($($name::MIN,)*);
|
||||
const MAX: Self = ($($name::MAX,)*);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@ pub trait Zero: Sized + Add<Self, Output = Self> {
|
|||
// FIXME (#5527): This should be an associated constant
|
||||
const ZERO: Self;
|
||||
|
||||
#[inline]
|
||||
fn zero() -> Self {
|
||||
Self::ZERO
|
||||
}
|
||||
|
@ -85,6 +86,7 @@ pub trait One: Sized + Mul<Self, Output = Self> {
|
|||
// FIXME (#5527): This should be an associated constant
|
||||
const ONE: Self;
|
||||
|
||||
#[inline]
|
||||
fn one() -> Self {
|
||||
Self::ONE
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue