auto merge of #10927 : g3xzh/rust/sum_bugfix, r=huonw

[rust.git] / src / libextra / stats.rs

diff --git a/src/libextra/stats.rs b/src/libextra/stats.rs
index f79ec51a9f7b715eef8829b770c9ef91fd41721f..07fb7ae96c7466a6eddbc3d8504b5ca98a7a316d 100644 (file)
--- a/src/libextra/stats.rs
+++ b/src/libextra/stats.rs
@@ -112,23 +112,18 @@ pub trait Stats {
 #[deriving(Clone, Eq)]
 #[allow(missing_doc)]
 pub struct Summary {
-    priv sum: f64,
-    // public
+    sum: f64,
     min: f64,
-    // public
     max: f64,
-    priv mean: f64,
-    // public
+    mean: f64,
     median: f64,
-    priv var: f64,
-    priv std_dev: f64,
-    priv std_dev_pct: f64,
-    // public
+    var: f64,
+    std_dev: f64,
+    std_dev_pct: f64,
     median_abs_dev: f64,
-    // public
     median_abs_dev_pct: f64,
-    priv quartiles: (f64,f64,f64),
-    priv iqr: f64,
+    quartiles: (f64,f64,f64),
+    iqr: f64,
 }
 
 impl Summary {
@@ -152,7 +147,7 @@ pub fn new(samples: &[f64]) -> Summary {
     }
 }
 
-impl<'self> Stats for &'self [f64] {
+impl<'a> Stats for &'a [f64] {
 
     // FIXME #11059 handle NaN, inf and overflow
     fn sum(self) -> f64 {