Skip to content

Commit f5e093f

Browse files
committed
Remove write_metric_diff and supporting code.
1 parent 51e28dd commit f5e093f

File tree

1 file changed

+7
-123
lines changed

1 file changed

+7
-123
lines changed

src/libtest/lib.rs

Lines changed: 7 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ extern crate "serialize" as rustc_serialize;
4444
extern crate term;
4545

4646
pub use self::TestFn::*;
47-
pub use self::MetricChange::*;
4847
pub use self::ColorConfig::*;
4948
pub use self::TestResult::*;
5049
pub use self::TestName::*;
@@ -62,7 +61,6 @@ use term::color::{Color, RED, YELLOW, GREEN, CYAN};
6261
use std::any::Any;
6362
use std::cmp;
6463
use std::collections::BTreeMap;
65-
use std::f64;
6664
use std::fmt::Show;
6765
use std::fmt;
6866
use std::io::fs::PathExtensions;
@@ -82,8 +80,7 @@ use std::time::Duration;
8280
pub mod test {
8381
pub use {Bencher, TestName, TestResult, TestDesc,
8482
TestDescAndFn, TestOpts, TrFailed, TrIgnored, TrOk,
85-
Metric, MetricMap, MetricAdded, MetricRemoved,
86-
MetricChange, Improvement, Regression, LikelyNoise,
83+
Metric, MetricMap,
8784
StaticTestFn, StaticTestName, DynTestName, DynTestFn,
8885
run_test, test_main, test_main_static, filter_tests,
8986
parse_opts, StaticBenchFn, ShouldFail};
@@ -244,13 +241,7 @@ impl Clone for MetricMap {
244241

245242
/// Analysis of a single change in metric
246243
#[derive(Copy, PartialEq, Show)]
247-
pub enum MetricChange {
248-
LikelyNoise,
249-
MetricAdded,
250-
MetricRemoved,
251-
Improvement(f64),
252-
Regression(f64)
253-
}
244+
pub struct MetricChange;
254245

255246
pub type MetricDiff = BTreeMap<String,MetricChange>;
256247

@@ -602,22 +593,6 @@ impl<T: Writer> ConsoleTestState<T> {
602593
self.write_pretty("bench", term::color::CYAN)
603594
}
604595

605-
pub fn write_added(&mut self) -> io::IoResult<()> {
606-
self.write_pretty("added", term::color::GREEN)
607-
}
608-
609-
pub fn write_improved(&mut self) -> io::IoResult<()> {
610-
self.write_pretty("improved", term::color::GREEN)
611-
}
612-
613-
pub fn write_removed(&mut self) -> io::IoResult<()> {
614-
self.write_pretty("removed", term::color::YELLOW)
615-
}
616-
617-
pub fn write_regressed(&mut self) -> io::IoResult<()> {
618-
self.write_pretty("regressed", term::color::RED)
619-
}
620-
621596
pub fn write_pretty(&mut self,
622597
word: &str,
623598
color: term::color::Color) -> io::IoResult<()> {
@@ -741,55 +716,6 @@ impl<T: Writer> ConsoleTestState<T> {
741716
Ok(())
742717
}
743718

744-
pub fn write_metric_diff(&mut self, diff: &MetricDiff) -> io::IoResult<()> {
745-
let mut noise = 0u;
746-
let mut improved = 0u;
747-
let mut regressed = 0u;
748-
let mut added = 0u;
749-
let mut removed = 0u;
750-
751-
for (k, v) in diff.iter() {
752-
match *v {
753-
LikelyNoise => noise += 1,
754-
MetricAdded => {
755-
added += 1;
756-
try!(self.write_added());
757-
try!(self.write_plain(format!(": {}\n", *k).as_slice()));
758-
}
759-
MetricRemoved => {
760-
removed += 1;
761-
try!(self.write_removed());
762-
try!(self.write_plain(format!(": {}\n", *k).as_slice()));
763-
}
764-
Improvement(pct) => {
765-
improved += 1;
766-
try!(self.write_plain(format!(": {} ", *k).as_slice()));
767-
try!(self.write_improved());
768-
try!(self.write_plain(format!(" by {:.2}%\n",
769-
pct as f64).as_slice()));
770-
}
771-
Regression(pct) => {
772-
regressed += 1;
773-
try!(self.write_plain(format!(": {} ", *k).as_slice()));
774-
try!(self.write_regressed());
775-
try!(self.write_plain(format!(" by {:.2}%\n",
776-
pct as f64).as_slice()));
777-
}
778-
}
779-
}
780-
try!(self.write_plain(format!("result of ratchet: {} metrics added, \
781-
{} removed, {} improved, {} regressed, \
782-
{} noise\n",
783-
added, removed, improved, regressed,
784-
noise).as_slice()));
785-
if regressed == 0 {
786-
try!(self.write_plain("updated ratchet file\n"));
787-
} else {
788-
try!(self.write_plain("left ratchet file untouched\n"));
789-
}
790-
Ok(())
791-
}
792-
793719
pub fn write_run_finish(&mut self,
794720
ratchet_metrics: &Option<Path>,
795721
ratchet_pct: Option<f64>) -> io::IoResult<bool> {
@@ -807,9 +733,7 @@ impl<T: Writer> ConsoleTestState<T> {
807733
forced to: {}%\n",
808734
pct).as_slice()))
809735
}
810-
let (diff, ok) = self.metrics.ratchet(pth, ratchet_pct);
811-
try!(self.write_metric_diff(&diff));
812-
ok
736+
true
813737
}
814738
};
815739

@@ -1233,47 +1157,35 @@ impl MetricMap {
12331157
let MetricMap(ref selfmap) = *self;
12341158
let MetricMap(ref old) = *old;
12351159
for (k, vold) in old.iter() {
1236-
let r = match selfmap.get(k) {
1237-
None => MetricRemoved,
1160+
match selfmap.get(k) {
1161+
None => (),
12381162
Some(v) => {
12391163
let delta = v.value - vold.value;
12401164
let noise = match noise_pct {
12411165
None => vold.noise.abs().max(v.noise.abs()),
12421166
Some(pct) => vold.value * pct / 100.0
12431167
};
12441168
if delta.abs() <= noise {
1245-
LikelyNoise
12461169
} else {
1247-
let pct = delta.abs() / vold.value.max(f64::EPSILON) * 100.0;
12481170
if vold.noise < 0.0 {
12491171
// When 'noise' is negative, it means we want
12501172
// to see deltas that go up over time, and can
12511173
// only tolerate slight negative movement.
12521174
if delta < 0.0 {
1253-
Regression(pct)
12541175
} else {
1255-
Improvement(pct)
12561176
}
12571177
} else {
12581178
// When 'noise' is positive, it means we want
12591179
// to see deltas that go down over time, and
12601180
// can only tolerate slight positive movements.
12611181
if delta < 0.0 {
1262-
Improvement(pct)
12631182
} else {
1264-
Regression(pct)
12651183
}
12661184
}
12671185
}
12681186
}
12691187
};
1270-
diff.insert((*k).clone(), r);
1271-
}
1272-
let MetricMap(ref map) = *self;
1273-
for (k, _) in map.iter() {
1274-
if !diff.contains_key(k) {
1275-
diff.insert((*k).clone(), MetricAdded);
1276-
}
1188+
diff.insert((*k).clone(), MetricChange);
12771189
}
12781190
diff
12791191
}
@@ -1316,7 +1228,6 @@ impl MetricMap {
13161228
let diff : MetricDiff = self.compare_to_old(&old, pct);
13171229
let ok = diff.iter().all(|(_, v)| {
13181230
match *v {
1319-
Regression(_) => false,
13201231
_ => true
13211232
}
13221233
});
@@ -1467,8 +1378,7 @@ pub mod bench {
14671378
mod tests {
14681379
use test::{TrFailed, TrIgnored, TrOk, filter_tests, parse_opts,
14691380
TestDesc, TestDescAndFn, TestOpts, run_test,
1470-
Metric, MetricMap, MetricAdded, MetricRemoved,
1471-
Improvement, Regression, LikelyNoise,
1381+
Metric, MetricMap,
14721382
StaticTestName, DynTestName, DynTestFn, ShouldFail};
14731383
use std::io::TempDir;
14741384
use std::thunk::Thunk;
@@ -1737,32 +1647,10 @@ mod tests {
17371647

17381648
let diff1 = m2.compare_to_old(&m1, None);
17391649

1740-
assert_eq!(*(diff1.get(&"in-both-noise".to_string()).unwrap()), LikelyNoise);
1741-
assert_eq!(*(diff1.get(&"in-first-noise".to_string()).unwrap()), MetricRemoved);
1742-
assert_eq!(*(diff1.get(&"in-second-noise".to_string()).unwrap()), MetricAdded);
1743-
assert_eq!(*(diff1.get(&"in-both-want-downwards-but-regressed".to_string()).unwrap()),
1744-
Regression(100.0));
1745-
assert_eq!(*(diff1.get(&"in-both-want-downwards-and-improved".to_string()).unwrap()),
1746-
Improvement(50.0));
1747-
assert_eq!(*(diff1.get(&"in-both-want-upwards-but-regressed".to_string()).unwrap()),
1748-
Regression(50.0));
1749-
assert_eq!(*(diff1.get(&"in-both-want-upwards-and-improved".to_string()).unwrap()),
1750-
Improvement(100.0));
17511650
assert_eq!(diff1.len(), 7);
17521651

17531652
let diff2 = m2.compare_to_old(&m1, Some(200.0));
17541653

1755-
assert_eq!(*(diff2.get(&"in-both-noise".to_string()).unwrap()), LikelyNoise);
1756-
assert_eq!(*(diff2.get(&"in-first-noise".to_string()).unwrap()), MetricRemoved);
1757-
assert_eq!(*(diff2.get(&"in-second-noise".to_string()).unwrap()), MetricAdded);
1758-
assert_eq!(*(diff2.get(&"in-both-want-downwards-but-regressed".to_string()).unwrap()),
1759-
LikelyNoise);
1760-
assert_eq!(*(diff2.get(&"in-both-want-downwards-and-improved".to_string()).unwrap()),
1761-
LikelyNoise);
1762-
assert_eq!(*(diff2.get(&"in-both-want-upwards-but-regressed".to_string()).unwrap()),
1763-
LikelyNoise);
1764-
assert_eq!(*(diff2.get(&"in-both-want-upwards-and-improved".to_string()).unwrap()),
1765-
LikelyNoise);
17661654
assert_eq!(diff2.len(), 7);
17671655
}
17681656

@@ -1786,8 +1674,6 @@ mod tests {
17861674
let (diff1, ok1) = m2.ratchet(&pth, None);
17871675
assert_eq!(ok1, false);
17881676
assert_eq!(diff1.len(), 2);
1789-
assert_eq!(*(diff1.get(&"runtime".to_string()).unwrap()), Regression(10.0));
1790-
assert_eq!(*(diff1.get(&"throughput".to_string()).unwrap()), LikelyNoise);
17911677

17921678
// Check that it was not rewritten.
17931679
let m3 = MetricMap::load(&pth);
@@ -1801,8 +1687,6 @@ mod tests {
18011687
let (diff2, ok2) = m2.ratchet(&pth, Some(10.0));
18021688
assert_eq!(ok2, true);
18031689
assert_eq!(diff2.len(), 2);
1804-
assert_eq!(*(diff2.get(&"runtime".to_string()).unwrap()), LikelyNoise);
1805-
assert_eq!(*(diff2.get(&"throughput".to_string()).unwrap()), LikelyNoise);
18061690

18071691
// Check that it was rewritten.
18081692
let m4 = MetricMap::load(&pth);

0 commit comments

Comments
 (0)