about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-09 16:59:28 +1100
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-13 02:02:43 +1100
commite6db701d5b09c169297aaaf2d5d53f64bcb4676e (patch)
tree2e43cc404663158bd2e4fef75e0c53c1183776ff /src/libtest
parent8666812dce7e219501642d4aabfd89e6b986834f (diff)
downloadrust-e6db701d5b09c169297aaaf2d5d53f64bcb4676e.tar.gz
rust-e6db701d5b09c169297aaaf2d5d53f64bcb4676e.zip
Deprecate Signed method wrappers
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/stats.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs
index 8c184ccbe43..ff274c874a8 100644
--- a/src/libtest/stats.rs
+++ b/src/libtest/stats.rs
@@ -17,7 +17,6 @@ use std::hash::Hash;
 use std::io;
 use std::mem;
 use std::num::Zero;
-use std::num;
 
 fn local_cmp<T:Float>(x: T, y: T) -> Ordering {
     // arbitrarily decide that NaNs are larger than everything.
@@ -166,7 +165,6 @@ impl<T: FloatMath + FromPrimitive> Summary<T> {
 }
 
 impl<'a, T: FloatMath + FromPrimitive> Stats<T> for &'a [T] {
-
     // FIXME #11059 handle NaN, inf and overflow
     fn sum(self) -> T {
         let mut partials = vec![];
@@ -176,8 +174,8 @@ impl<'a, T: FloatMath + FromPrimitive> Stats<T> for &'a [T] {
             // This inner loop applies `hi`/`lo` summation to each
             // partial so that the list of partial sums remains exact.
             for i in range(0, partials.len()) {
-                let mut y = partials[i];
-                if num::abs(x) < num::abs(y) {
+                let mut y: T = partials[i];
+                if x.abs() < y.abs() {
                     mem::swap(&mut x, &mut y);
                 }
                 // Rounded `x+y` is stored in `hi` with round-off stored in
@@ -249,7 +247,7 @@ impl<'a, T: FloatMath + FromPrimitive> Stats<T> for &'a [T] {
 
     fn median_abs_dev(self) -> T {
         let med = self.median();
-        let abs_devs: Vec<T> = self.iter().map(|&v| num::abs(med - v)).collect();
+        let abs_devs: Vec<T> = self.iter().map(|&v| (med - v).abs()).collect();
         // This constant is derived by smarter statistics brains than me, but it is
         // consistent with how R and other packages treat the MAD.
         let number = FromPrimitive::from_f64(1.4826).unwrap();