summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-10 16:26:10 +1100
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-13 03:46:03 +1100
commite965ba85ca689ad77f63b7f0af9d7e337dcb4825 (patch)
tree0ecf2223970c18455595e523ca594fe6d3321129 /src/libtest
parent891559e30d045606aa109f4991074f783a5e50f8 (diff)
downloadrust-e965ba85ca689ad77f63b7f0af9d7e337dcb4825.tar.gz
rust-e965ba85ca689ad77f63b7f0af9d7e337dcb4825.zip
Remove lots of numeric traits from the preludes
Num, NumCast, Unsigned, Float, Primitive and Int have been removed.
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs1
-rw-r--r--src/libtest/stats.rs9
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index ee678641429..a25aff3eaff 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -60,6 +60,7 @@ use std::io::fs::PathExtensions;
 use std::io::stdio::StdWriter;
 use std::io::{File, ChanReader, ChanWriter};
 use std::io;
+use std::num::{Int, FloatMath};
 use std::os;
 use std::string::String;
 use std::task::TaskBuilder;
diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs
index 6be5bca552d..5cec5076e06 100644
--- a/src/libtest/stats.rs
+++ b/src/libtest/stats.rs
@@ -16,6 +16,7 @@ use std::fmt::Show;
 use std::hash::Hash;
 use std::io;
 use std::mem;
+use std::num::{Float, FloatMath};
 
 fn local_cmp<T:Float>(x: T, y: T) -> Ordering {
     // arbitrarily decide that NaNs are larger than everything.
@@ -1042,11 +1043,11 @@ mod tests {
     }
     #[test]
     fn test_sum_f64s() {
-        assert_eq!([0.5f64, 3.2321f64, 1.5678f64].sum(0.0), 5.2999);
+        assert_eq!([0.5f64, 3.2321f64, 1.5678f64].sum(), 5.2999);
     }
     #[test]
     fn test_sum_f64_between_ints_that_sum_to_0() {
-        assert_eq!([1e30f64, 1.2f64, -1e30f64].sum(0.0), 1.2);
+        assert_eq!([1e30f64, 1.2f64, -1e30f64].sum(), 1.2);
     }
 }
 
@@ -1058,7 +1059,7 @@ mod bench {
     #[bench]
     pub fn sum_three_items(b: &mut Bencher) {
         b.iter(|| {
-            [1e20f64, 1.5f64, -1e20f64].sum(0.0);
+            [1e20f64, 1.5f64, -1e20f64].sum();
         })
     }
     #[bench]
@@ -1067,7 +1068,7 @@ mod bench {
         let v = Vec::from_fn(500, |i| nums[i%5]);
 
         b.iter(|| {
-            v.as_slice().sum(0.0);
+            v.as_slice().sum();
         })
     }
 }