diff options
| -rw-r--r-- | src/libstd/num/f32.rs | 18 | ||||
| -rw-r--r-- | src/libstd/num/f64.rs | 18 | ||||
| -rw-r--r-- | src/libstd/num/int_macros.rs | 18 | ||||
| -rw-r--r-- | src/libstd/num/mod.rs | 21 | ||||
| -rw-r--r-- | src/libstd/num/uint_macros.rs | 18 |
5 files changed, 9 insertions, 84 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index a8eaa895650..69686253562 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -554,16 +554,7 @@ impl Bounded for f32 { fn max_value() -> f32 { 3.40282347e+38 } } -impl Primitive for f32 { - #[inline] - fn bits(_: Option<f32>) -> uint { 32 } - - #[inline] - fn bytes(_: Option<f32>) -> uint { Primitive::bits(Some(0f32)) / 8 } - - #[inline] - fn is_signed(_: Option<f32>) -> bool { true } -} +impl Primitive for f32 {} impl Float for f32 { #[inline] @@ -1174,13 +1165,6 @@ mod tests { } #[test] - fn test_primitive() { - let none: Option<f32> = None; - assert_eq!(Primitive::bits(none), mem::size_of::<f32>() * 8); - assert_eq!(Primitive::bytes(none), mem::size_of::<f32>()); - } - - #[test] fn test_is_normal() { let nan: f32 = Float::nan(); let inf: f32 = Float::infinity(); diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index fe51cb07646..bdfb42b4b88 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -556,16 +556,7 @@ impl Bounded for f64 { fn max_value() -> f64 { 1.7976931348623157e+308 } } -impl Primitive for f64 { - #[inline] - fn bits(_: Option<f64>) -> uint { 64 } - - #[inline] - fn bytes(_: Option<f64>) -> uint { Primitive::bits(Some(0f64)) / 8 } - - #[inline] - fn is_signed(_: Option<f64>) -> bool { true } -} +impl Primitive for f64 {} impl Float for f64 { #[inline] @@ -1179,13 +1170,6 @@ mod tests { } #[test] - fn test_primitive() { - let none: Option<f64> = None; - assert_eq!(Primitive::bits(none), mem::size_of::<f64>() * 8); - assert_eq!(Primitive::bytes(none), mem::size_of::<f64>()); - } - - #[test] fn test_is_normal() { let nan: f64 = Float::nan(); let inf: f64 = Float::infinity(); diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index add0991f7af..80bc24e2d62 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -361,16 +361,7 @@ impl Bounded for $T { impl Int for $T {} -impl Primitive for $T { - #[inline] - fn bits(_: Option<$T>) -> uint { bits } - - #[inline] - fn bytes(_: Option<$T>) -> uint { bits / 8 } - - #[inline] - fn is_signed(_: Option<$T>) -> bool { true } -} +impl Primitive for $T {} // String conversion functions and impl str -> num @@ -640,13 +631,6 @@ mod tests { } #[test] - fn test_primitive() { - let none: Option<$T> = None; - assert_eq!(Primitive::bits(none), mem::size_of::<$T>() * 8); - assert_eq!(Primitive::bytes(none), mem::size_of::<$T>()); - } - - #[test] fn test_from_str() { assert_eq!(from_str::<$T>("0"), Some(0 as $T)); assert_eq!(from_str::<$T>("3"), Some(3 as $T)); diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index 05f21c7d448..ab2604ee196 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -17,6 +17,7 @@ use clone::{Clone, DeepClone}; use cmp::{Eq, Ord}; +use mem::size_of; use ops::{Add, Sub, Mul, Div, Rem, Neg}; use ops::{Not, BitAnd, BitOr, BitXor, Shl, Shr}; use option::{Option, Some, None}; @@ -381,19 +382,7 @@ pub trait Primitive: Clone + Num + NumCast + Orderable - + Bounded - + Neg<Self> - + Add<Self,Self> - + Sub<Self,Self> - + Mul<Self,Self> - + Div<Self,Self> - + Rem<Self,Self> { - // FIXME (#5527): These should be associated constants - // FIXME (#8888): Removing `unused_self` requires #8888 to be fixed. - fn bits(unused_self: Option<Self>) -> uint; - fn bytes(unused_self: Option<Self>) -> uint; - fn is_signed(unused_self: Option<Self>) -> bool; -} + + Bounded {} /// A collection of traits relevant to primitive signed and unsigned integers pub trait Int: Integer @@ -536,7 +525,7 @@ pub trait ToPrimitive { macro_rules! impl_to_primitive_int_to_int( ($SrcT:ty, $DstT:ty) => ( { - if Primitive::bits(None::<$SrcT>) <= Primitive::bits(None::<$DstT>) { + if size_of::<$SrcT>() <= size_of::<$DstT>() { Some(*self as $DstT) } else { let n = *self as i64; @@ -621,7 +610,7 @@ macro_rules! impl_to_primitive_uint_to_int( macro_rules! impl_to_primitive_uint_to_uint( ($SrcT:ty, $DstT:ty) => ( { - if Primitive::bits(None::<$SrcT>) <= Primitive::bits(None::<$DstT>) { + if size_of::<$SrcT>() <= size_of::<$DstT>() { Some(*self as $DstT) } else { let zero: $SrcT = Zero::zero(); @@ -677,7 +666,7 @@ impl_to_primitive_uint!(u64) macro_rules! impl_to_primitive_float_to_float( ($SrcT:ty, $DstT:ty) => ( - if Primitive::bits(None::<$SrcT>) <= Primitive::bits(None::<$DstT>) { + if size_of::<$SrcT>() <= size_of::<$DstT>() { Some(*self as $DstT) } else { let n = *self as f64; diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 97e547a2d42..1b822a491c6 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -285,16 +285,7 @@ impl ToStrRadix for $T { } } -impl Primitive for $T { - #[inline] - fn bits(_: Option<$T>) -> uint { bits } - - #[inline] - fn bytes(_: Option<$T>) -> uint { bits / 8 } - - #[inline] - fn is_signed(_: Option<$T>) -> bool { false } -} +impl Primitive for $T {} impl Bitwise for $T { /// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic. @@ -416,13 +407,6 @@ mod tests { } #[test] - fn test_primitive() { - let none: Option<$T> = None; - assert_eq!(Primitive::bits(none), mem::size_of::<$T>() * 8); - assert_eq!(Primitive::bytes(none), mem::size_of::<$T>()); - } - - #[test] pub fn test_to_str() { assert_eq!((0 as $T).to_str_radix(10u), ~"0"); assert_eq!((1 as $T).to_str_radix(10u), ~"1"); |