Remove lots of numeric traits from the preludes

Num, NumCast, Unsigned, Float, Primitive and Int have been removed.

9 files changed, 16 insertions, 4 deletions

diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs
index 782ef098d81..eb81935a8c9 100644
--- a/src/libstd/fmt.rs
+++ b/src/libstd/fmt.rs
@@ -190,6 +190,7 @@ like:
 ```rust
 use std::fmt;
 use std::f64;
+use std::num::Float;
 
 struct Vector2D {
     x: int,
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index c72b8205f19..3f46cc8af50 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -20,6 +20,7 @@ use prelude::*;
 use from_str::FromStr;
 use intrinsics;
 use libc::c_int;
+use num::{Float, FloatMath};
 use num::strconv;
 use num;
 
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
index 311fd0e87a3..4d691fc9676 100644
--- a/src/libstd/num/f64.rs
+++ b/src/libstd/num/f64.rs
@@ -19,6 +19,7 @@ use prelude::*;
 use from_str::FromStr;
 use intrinsics;
 use libc::c_int;
+use num::{Float, FloatMath};
 use num::strconv;
 use num;
 
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index 28fe7538ca5..62e70e0c9de 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -18,7 +18,9 @@
 
 use option::Option;
 
+#[cfg(test)] use cmp::PartialEq;
 #[cfg(test)] use fmt::Show;
+#[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};
@@ -135,7 +137,12 @@ pub fn abs_sub<T: FloatMath>(x: T, y: T) -> T {
 
 /// Helper function for testing numeric operations
 #[cfg(test)]
-pub fn test_num<T: Int + Show>(ten: T, two: T) {
+pub fn test_num<T>(ten: T, two: T) where
+    T: PartialEq + NumCast
+     + Add<T, T> + Sub<T, T>
+     + Mul<T, T> + Div<T, T>
+     + Rem<T, T> + Show
+{
     assert_eq!(ten.add(&two),  cast(12i).unwrap());
     assert_eq!(ten.sub(&two),  cast(8i).unwrap());
     assert_eq!(ten.mul(&two),  cast(20i).unwrap());
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index 3c20d205b77..0baae850eaa 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -67,9 +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::{Num, NumCast};
-#[doc(no_inline)] pub use num::{Signed, Unsigned, Primitive, Int, Float};
-#[doc(no_inline)] pub use num::{FloatMath, ToPrimitive, FromPrimitive};
+#[doc(no_inline)] pub use num::{Signed, 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/rand/reader.rs b/src/libstd/rand/reader.rs
index c8ed9805215..ab3216e93a0 100644
--- a/src/libstd/rand/reader.rs
+++ b/src/libstd/rand/reader.rs
@@ -78,6 +78,7 @@ mod test {
 
     use super::ReaderRng;
     use io::MemReader;
+    use num::Int;
     use rand::Rng;
 
     #[test]
diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs
index 65eb987afea..cacb128faa5 100644
--- a/src/libstd/sys/common/mod.rs
+++ b/src/libstd/sys/common/mod.rs
@@ -15,6 +15,7 @@ use io::{mod, IoError, IoResult};
 use prelude::*;
 use sys::{last_error, retry, fs};
 use c_str::CString;
+use num::Int;
 use path::BytesContainer;
 use collections;
 
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs
index 7c44142d93c..7bb3c6b0ec9 100644
--- a/src/libstd/sys/common/net.rs
+++ b/src/libstd/sys/common/net.rs
@@ -11,6 +11,7 @@
 use alloc::arc::Arc;
 use libc::{mod, c_char, c_int};
 use mem;
+use num::Int;
 use ptr::{mod, null, null_mut};
 use rt::mutex;
 use io::net::ip::{SocketAddr, IpAddr, Ipv4Addr, Ipv6Addr};
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs
index 939ae79facf..969570d385c 100644
--- a/src/libstd/sys/unix/mod.rs
+++ b/src/libstd/sys/unix/mod.rs
@@ -18,6 +18,7 @@
 extern crate libc;
 
 use num;
+use num::Int;
 use prelude::*;
 use io::{mod, IoResult, IoError};
 use sys_common::mkerr_libc;