Deprecate Zero and One traits

8 files changed, 20 insertions, 24 deletions

diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index 6e2e8b8752f..c72b8205f19 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -655,7 +655,7 @@ mod tests {
         let nan: f32 = Float::nan();
         let inf: f32 = Float::infinity();
         let neg_inf: f32 = Float::neg_infinity();
-        let zero: f32 = Zero::zero();
+        let zero: f32 = Float::zero();
         let neg_zero: f32 = Float::neg_zero();
         assert!(!nan.is_normal());
         assert!(!inf.is_normal());
@@ -672,7 +672,7 @@ mod tests {
         let nan: f32 = Float::nan();
         let inf: f32 = Float::infinity();
         let neg_inf: f32 = Float::neg_infinity();
-        let zero: f32 = Zero::zero();
+        let zero: f32 = Float::zero();
         let neg_zero: f32 = Float::neg_zero();
         assert_eq!(nan.classify(), FPNaN);
         assert_eq!(inf.classify(), FPInfinite);
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
index 591ca3486d2..311fd0e87a3 100644
--- a/src/libstd/num/f64.rs
+++ b/src/libstd/num/f64.rs
@@ -653,7 +653,7 @@ mod tests {
         let nan: f64 = Float::nan();
         let inf: f64 = Float::infinity();
         let neg_inf: f64 = Float::neg_infinity();
-        let zero: f64 = Zero::zero();
+        let zero: f64 = Float::zero();
         let neg_zero: f64 = Float::neg_zero();
         assert!(!nan.is_normal());
         assert!(!inf.is_normal());
@@ -670,7 +670,7 @@ mod tests {
         let nan: f64 = Float::nan();
         let inf: f64 = Float::infinity();
         let neg_inf: f64 = Float::neg_infinity();
-        let zero: f64 = Zero::zero();
+        let zero: f64 = Float::zero();
         let neg_zero: f64 = Float::neg_zero();
         assert_eq!(nan.classify(), FPNaN);
         assert_eq!(inf.classify(), FPInfinite);
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index 2be88e01eed..f831de88858 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -771,10 +771,7 @@ mod tests {
         assert_pow!((3i,     0 ) => 1);
         assert_pow!((5i,     1 ) => 5);
         assert_pow!((-4i,    2 ) => 16);
-        assert_pow!((0.5f64, 5 ) => 0.03125);
         assert_pow!((8i,     3 ) => 512);
-        assert_pow!((8.0f64, 5 ) => 32768.0);
-        assert_pow!((8.5f64, 5 ) => 44370.53125);
         assert_pow!((2u64,   50) => 1125899906842624);
     }
 }
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index 65d48dd94f3..7c21b020647 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -94,7 +94,7 @@ pub enum SignFormat {
 fn int_to_str_bytes_common<T: Int>(num: T, radix: uint, sign: SignFormat, f: |u8|) {
     assert!(2 <= radix && radix <= 36);
 
-    let _0: T = num::zero();
+    let _0: T = Int::zero();
 
     let neg = num < _0;
     let radix_gen: T = num::cast(radix).unwrap();
@@ -194,8 +194,8 @@ pub fn float_to_str_bytes_common<T: Float>(
         _ => ()
     }
 
-    let _0: T = num::zero();
-    let _1: T = num::one();
+    let _0: T = Float::zero();
+    let _1: T = Float::one();
 
     match num.classify() {
         FPNaN => { return (b"NaN".to_vec(), true); }
@@ -430,8 +430,8 @@ pub fn from_str_radix_float<T: Float>(src: &str, radix: uint) -> Option<T> {
            "from_str_radix_float: must lie in the range `[2, 36]` - found {}",
            radix);
 
-    let _0: T = num::zero();
-    let _1: T = num::one();
+    let _0: T = Float::zero();
+    let _1: T = Float::one();
     let radix_t: T = num::cast(radix as int).unwrap();
 
     // Special values
@@ -558,8 +558,8 @@ pub fn from_str_radix_float<T: Float>(src: &str, radix: uint) -> Option<T> {
             };
 
             match (is_positive, exp) {
-                (true,  Some(exp)) => num::pow(base, exp),
-                (false, Some(exp)) => _1 / num::pow(base, exp),
+                (true,  Some(exp)) => base.powi(exp as i32),
+                (false, Some(exp)) => _1 / base.powi(exp as i32),
                 (_, None)          => return None,
             }
         },
@@ -578,8 +578,8 @@ pub fn from_str_radix_int<T: Int>(src: &str, radix: uint) -> Option<T> {
         num::cast(x).unwrap()
     }
 
-    let _0: T = num::zero();
-    let _1: T = num::one();
+    let _0: T = Int::zero();
+    let _1: T = Int::one();
     let is_signed = _0 > Int::min_value();
 
     let (is_positive, src) =  match src.slice_shift_char() {
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index 9918e939097..cdc18a19f51 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -356,7 +356,7 @@ impl Path {
                         Some(vec![SEP_BYTE])
                     } else {
                         let n = if is_abs { comps.len() } else { comps.len() - 1} +
-                                comps.iter().map(|v| v.len()).sum();
+                                comps.iter().map(|v| v.len()).sum(0);
                         let mut v = Vec::with_capacity(n);
                         let mut it = comps.into_iter();
                         if !is_abs {
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index 3a5350f0a29..8c4d3e1ab4f 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -781,7 +781,7 @@ impl Path {
                         let prefix_ = s.slice_to(prefix_len(prefix));
                         let n = prefix_.len() +
                                 if is_abs { comps.len() } else { comps.len() - 1} +
-                                comps.iter().map(|v| v.len()).sum();
+                                comps.iter().map(|v| v.len()).sum(0);
                         let mut s = String::with_capacity(n);
                         match prefix {
                             Some(DiskPrefix) => {
diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs
index d5ac6170497..65eb987afea 100644
--- a/src/libstd/sys/common/mod.rs
+++ b/src/libstd/sys/common/mod.rs
@@ -13,7 +13,6 @@
 
 use io::{mod, IoError, IoResult};
 use prelude::*;
-use num;
 use sys::{last_error, retry, fs};
 use c_str::CString;
 use path::BytesContainer;
@@ -57,8 +56,8 @@ pub fn unimpl() -> IoError {
 }
 
 // unix has nonzero values as errors
-pub fn mkerr_libc<Int: num::Zero>(ret: Int) -> IoResult<()> {
-    if !ret.is_zero() {
+pub fn mkerr_libc<T: Int>(ret: T) -> IoResult<()> {
+    if ret != Int::zero() {
         Err(last_error())
     } else {
         Ok(())
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs
index de104335d7c..939ae79facf 100644
--- a/src/libstd/sys/unix/mod.rs
+++ b/src/libstd/sys/unix/mod.rs
@@ -116,11 +116,11 @@ pub fn decode_error_detailed(errno: i32) -> IoError {
 }
 
 #[inline]
-pub fn retry<I: PartialEq + num::One + Neg<I>> (f: || -> I) -> I {
-    let minus_one = -num::one::<I>();
+pub fn retry<T: Signed + Int> (f: || -> T) -> T {
+    let one: T = Int::one();
     loop {
         let n = f();
-        if n == minus_one && os::errno() == libc::EINTR as int { }
+        if n == -one && os::errno() == libc::EINTR as int { }
         else { return n }
     }
 }