Remove Signed trait and add SignedInt trait

The methods have been moved into Float and SignedInt

4 files changed, 5 insertions, 5 deletions

diff --git a/src/libstd/num/float_macros.rs b/src/libstd/num/float_macros.rs
index 519de85edde..4b3727ead61 100644
--- a/src/libstd/num/float_macros.rs
+++ b/src/libstd/num/float_macros.rs
@@ -14,6 +14,7 @@
 
 macro_rules! assert_approx_eq(
     ($a:expr, $b:expr) => ({
+        use num::Float;
         let (a, b) = (&$a, &$b);
         assert!((*a - *b).abs() < 1.0e-6,
                 "{} is not approximately equal to {}", *a, *b);
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index 62e70e0c9de..0afc8ce0452 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -23,9 +23,8 @@ use option::Option;
 #[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem};
 
 pub use core::num::{Num, div_rem, Zero, zero, One, one};
-pub use core::num::{Signed, abs, signum};
 pub use core::num::{Unsigned, pow, Bounded};
-pub use core::num::{Primitive, Int, UnsignedInt};
+pub use core::num::{Primitive, Int, SignedInt, UnsignedInt};
 pub use core::num::{cast, FromPrimitive, NumCast, ToPrimitive};
 pub use core::num::{next_power_of_two, is_power_of_two};
 pub use core::num::{checked_next_power_of_two};
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index 0baae850eaa..158e7a59f6d 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -67,7 +67,7 @@
 #[doc(no_inline)] pub use iter::{Iterator, DoubleEndedIterator};
 #[doc(no_inline)] pub use iter::{RandomAccessIterator, CloneableIterator};
 #[doc(no_inline)] pub use iter::{OrdIterator, MutableDoubleEndedIterator};
-#[doc(no_inline)] pub use num::{Signed, ToPrimitive, FromPrimitive};
+#[doc(no_inline)] pub use num::{ToPrimitive, FromPrimitive};
 #[doc(no_inline)] pub use boxed::Box;
 #[doc(no_inline)] pub use option::{Option, Some, None};
 #[doc(no_inline)] pub use path::{GenericPath, Path, PosixPath, WindowsPath};
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs
index 969570d385c..4db9e8a9df8 100644
--- a/src/libstd/sys/unix/mod.rs
+++ b/src/libstd/sys/unix/mod.rs
@@ -18,7 +18,7 @@
 extern crate libc;
 
 use num;
-use num::Int;
+use num::{Int, SignedInt};
 use prelude::*;
 use io::{mod, IoResult, IoError};
 use sys_common::mkerr_libc;
@@ -117,7 +117,7 @@ pub fn decode_error_detailed(errno: i32) -> IoError {
 }
 
 #[inline]
-pub fn retry<T: Signed + Int> (f: || -> T) -> T {
+pub fn retry<T: SignedInt> (f: || -> T) -> T {
     let one: T = Int::one();
     loop {
         let n = f();