From 989fbfde39c4eb9cf1c7881aed985dea4f19f711 Mon Sep 17 00:00:00 2001
From: Ahmed Charles <acharles@outlook.com>
Date: Wed, 21 Jan 2015 03:09:44 -0800
Subject: [PATCH] Make fmt_metrics() part of the impl.

---
 src/libtest/lib.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index e1ae87475ca..3412e61ff15 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -544,7 +544,7 @@ pub fn write_result(&mut self, result: &TestResult) -> io::IoResult<()> {
             TrIgnored => self.write_ignored(),
             TrMetrics(ref mm) => {
                 try!(self.write_metric());
-                self.write_plain(format!(": {}", fmt_metrics(mm)).as_slice())
+                self.write_plain(format!(": {}", mm.fmt_metrics()).as_slice())
             }
             TrBench(ref bs) => {
                 try!(self.write_bench());
@@ -587,7 +587,7 @@ pub fn write_log(&mut self, test: &TestDesc,
                         TrOk => "ok".to_string(),
                         TrFailed => "failed".to_string(),
                         TrIgnored => "ignored".to_string(),
-                        TrMetrics(ref mm) => fmt_metrics(mm),
+                        TrMetrics(ref mm) => mm.fmt_metrics(),
                         TrBench(ref bs) => fmt_bench_samples(bs)
                     }, test.name.as_slice());
                 o.write(s.as_bytes())
@@ -645,15 +645,6 @@ pub fn write_run_finish(&mut self) -> io::IoResult<bool> {
     }
 }
 
-pub fn fmt_metrics(mm: &MetricMap) -> String {
-    let MetricMap(ref mm) = *mm;
-    let v : Vec<String> = mm.iter()
-        .map(|(k,v)| format!("{}: {} (+/- {})", *k,
-                             v.value as f64, v.noise as f64))
-        .collect();
-    v.connect(", ")
-}
-
 pub fn fmt_bench_samples(bs: &BenchSamples) -> String {
     if bs.mb_s != 0 {
         format!("{:>9} ns/iter (+/- {}) = {} MB/s",
@@ -1010,6 +1001,15 @@ pub fn insert_metric(&mut self, name: &str, value: f64, noise: f64) {
         let MetricMap(ref mut map) = *self;
         map.insert(name.to_string(), m);
     }
+
+    pub fn fmt_metrics(&self) -> String {
+        let MetricMap(ref mm) = *self;
+        let v : Vec<String> = mm.iter()
+            .map(|(k,v)| format!("{}: {} (+/- {})", *k,
+                                 v.value as f64, v.noise as f64))
+            .collect();
+        v.connect(", ")
+    }
 }
 
 
-- 
2.44.0