Deprecate Zero and One traits

2 files changed, 5 insertions, 6 deletions

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 }
     }
 }