Skip to content

Commit 33a7978

Browse files
committed
---
yaml --- r: 174899 b: refs/heads/snap-stage3 c: 989fbfd h: refs/heads/master i: 174897: fca4dae 174895: a244e28 v: v3
1 parent 37e80d7 commit 33a7978

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8a6a129aec86341a2b066a338a78b9e5509137c5
4+
refs/heads/snap-stage3: 989fbfde39c4eb9cf1c7881aed985dea4f19f711
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libtest/lib.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ impl<T: Writer> ConsoleTestState<T> {
544544
TrIgnored => self.write_ignored(),
545545
TrMetrics(ref mm) => {
546546
try!(self.write_metric());
547-
self.write_plain(format!(": {}", fmt_metrics(mm)).as_slice())
547+
self.write_plain(format!(": {}", mm.fmt_metrics()).as_slice())
548548
}
549549
TrBench(ref bs) => {
550550
try!(self.write_bench());
@@ -587,7 +587,7 @@ impl<T: Writer> ConsoleTestState<T> {
587587
TrOk => "ok".to_string(),
588588
TrFailed => "failed".to_string(),
589589
TrIgnored => "ignored".to_string(),
590-
TrMetrics(ref mm) => fmt_metrics(mm),
590+
TrMetrics(ref mm) => mm.fmt_metrics(),
591591
TrBench(ref bs) => fmt_bench_samples(bs)
592592
}, test.name.as_slice());
593593
o.write(s.as_bytes())
@@ -645,15 +645,6 @@ impl<T: Writer> ConsoleTestState<T> {
645645
}
646646
}
647647

648-
pub fn fmt_metrics(mm: &MetricMap) -> String {
649-
let MetricMap(ref mm) = *mm;
650-
let v : Vec<String> = mm.iter()
651-
.map(|(k,v)| format!("{}: {} (+/- {})", *k,
652-
v.value as f64, v.noise as f64))
653-
.collect();
654-
v.connect(", ")
655-
}
656-
657648
pub fn fmt_bench_samples(bs: &BenchSamples) -> String {
658649
if bs.mb_s != 0 {
659650
format!("{:>9} ns/iter (+/- {}) = {} MB/s",
@@ -1010,6 +1001,15 @@ impl MetricMap {
10101001
let MetricMap(ref mut map) = *self;
10111002
map.insert(name.to_string(), m);
10121003
}
1004+
1005+
pub fn fmt_metrics(&self) -> String {
1006+
let MetricMap(ref mm) = *self;
1007+
let v : Vec<String> = mm.iter()
1008+
.map(|(k,v)| format!("{}: {} (+/- {})", *k,
1009+
v.value as f64, v.noise as f64))
1010+
.collect();
1011+
v.connect(", ")
1012+
}
10131013
}
10141014

10151015

0 commit comments

Comments
 (0)