---

yaml
---
r: 47668
b: refs/heads/incoming
c: 3edc7c0
h: refs/heads/master
v: v3

Author: Kimundi

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: df36a8dfc98af7e78b416ca1faab3c214be29fab
+refs/heads/incoming: 3edc7c0b9cbdf1b396c81fe1700f0816b9f239d0
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/num/int-template.rs

@@ -177,18 +177,6 @@ impl num::One for T {
     static pure fn one() -> T { 1 }
 }
 
-impl num::Round for T {
-    #[inline(always)]
-    pure fn round(&self, _: num::RoundMode) -> T { *self }
-
-    #[inline(always)]
-    pure fn floor(&self) -> T { *self }
-    #[inline(always)]
-    pure fn ceil(&self) -> T { *self }
-    #[inline(always)]
-    pure fn fract(&self) -> T { 0 }
-}
-
 #[cfg(notest)]
 impl ops::Add<T,T> for T {
     pure fn add(&self, other: &T) -> T { *self + *other }

branches/incoming/src/libcore/num/num.rs

@@ -44,6 +44,13 @@ pub trait Round {
     pure fn fract(&self) -> Self;
 }
 
+pub enum RoundMode {
+    RoundDown,
+    RoundUp,
+    RoundToZero,
+    RoundFromZero
+}
+
 /**
  * Cast a number the the enclosing type
  *
@@ -82,13 +89,6 @@ pub trait NumCast {
     pure fn to_float(&self) -> float;
 }
 
-pub enum RoundMode {
-    RoundDown,
-    RoundUp,
-    RoundToZero,
-    RoundFromZero
-}
-
 pub trait ToStrRadix {
     pub pure fn to_str_radix(&self, radix: uint) -> ~str;
 }
@@ -99,62 +99,6 @@ pub trait FromStrRadix {
 
 // Generic math functions:
 
-/// Dynamically calculates the value `inf` (`1/0`).
-/// Can fail on integer types.
-#[inline(always)]
-pub pure fn infinity<T:One+Zero+Div<T,T>>() -> T {
-    let _0: T = Zero::zero();
-    let _1: T = One::one();
-    _1 / _0
-}
-
-/// Dynamically calculates the value `-inf` (`-1/0`).
-/// Can fail on integer types.
-#[inline(always)]
-pub pure fn neg_infinity<T:One+Zero+Div<T,T>+Neg<T>>() -> T {
-    let _0: T = Zero::zero();
-    let _1: T = One::one();
-    - _1 / _0
-}
-
-/// Dynamically calculates the value `NaN` (`0/0`).
-/// Can fail on integer types.
-#[inline(always)]
-pub pure fn NaN<T:Zero+Div<T,T>>() -> T {
-    let _0: T = Zero::zero();
-    _0 / _0
-}
-
-/// Returns `true` if `num` has the value `inf` (`1/0`).
-/// Can fail on integer types.
-#[inline(always)]
-pub pure fn is_infinity<T:One+Zero+Eq+Div<T,T>>(num: &T) -> bool {
-    (*num) == (infinity::<T>())
-}
-
-/// Returns `true` if `num` has the value `-inf` (`-1/0`).
-/// Can fail on integer types.
-#[inline(always)]
-pub pure fn is_neg_infinity<T:One+Zero+Eq+Div<T,T>+Neg<T>>(num: &T)
-                                                            -> bool {
-    (*num) == (neg_infinity::<T>())
-}
-
-/// Returns `true` if `num` has the value `NaN` (is not equal to itself).
-#[inline(always)]
-pub pure fn is_NaN<T:Eq>(num: &T) -> bool {
-    (*num) != (*num)
-}
-
-/// Returns `true` if `num` has the value `-0` (`1/num == -1/0`).
-/// Can fail on integer types.
-#[inline(always)]
-pub pure fn is_neg_zero<T:One+Zero+Eq+Div<T,T>+Neg<T>>(num: &T) -> bool {
-    let _1: T = One::one();
-    let _0: T = Zero::zero();
-    *num == _0 && is_neg_infinity(&(_1 / *num))
-}
-
 /**
  * Calculates a power to a given radix, optimized for uint `pow` and `radix`.
  *

branches/incoming/src/libcore/num/uint-template.rs

@@ -141,18 +141,6 @@ impl num::One for T {
     static pure fn one() -> T { 1 }
 }
 
-impl num::Round for T {
-    #[inline(always)]
-    pure fn round(&self, _: num::RoundMode) -> T { *self }
-
-    #[inline(always)]
-    pure fn floor(&self) -> T { *self }
-    #[inline(always)]
-    pure fn ceil(&self) -> T { *self }
-    #[inline(always)]
-    pure fn fract(&self) -> T { 0 }
-}
-
 #[cfg(notest)]
 impl ops::Add<T,T> for T {
     pure fn add(&self, other: &T) -> T { *self + *other }