diff options
| author | bors <bors@rust-lang.org> | 2015-02-03 07:59:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-03 07:59:04 +0000 |
| commit | 336c8d2e9c6b276b162bdb3edd43706372e6eddd (patch) | |
| tree | ce8b369728b285ce16ea77a7e43d8e9ce05b1be5 /src/libtest | |
| parent | 7858cb432d3f2efc0374424cb2b51518f697c172 (diff) | |
| parent | 8f4844d58b0a84792e85a650c510270559b81022 (diff) | |
| download | rust-336c8d2e9c6b276b162bdb3edd43706372e6eddd.tar.gz rust-336c8d2e9c6b276b162bdb3edd43706372e6eddd.zip | |
Auto merge of #21613 - alfie:suffix-small, r=alexcrichton
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 0692d7e5faa..c369e354875 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -464,14 +464,14 @@ impl<T: Writer> ConsoleTestState<T> { out: out, log_out: log_out, use_color: use_color(opts), - total: 0u, - passed: 0u, - failed: 0u, - ignored: 0u, - measured: 0u, + total: 0, + passed: 0, + failed: 0, + ignored: 0, + measured: 0, metrics: MetricMap::new(), failures: Vec::new(), - max_name_len: 0u, + max_name_len: 0, }) } @@ -601,7 +601,7 @@ impl<T: Writer> ConsoleTestState<T> { pub fn write_run_finish(&mut self) -> old_io::IoResult<bool> { assert!(self.passed + self.failed + self.ignored + self.measured == self.total); - let success = self.failed == 0u; + let success = self.failed == 0; if !success { try!(self.write_failures()); } @@ -679,7 +679,7 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn> ) -> old_io: let mut st = try!(ConsoleTestState::new(opts, None::<StdWriter>)); fn len_if_padded(t: &TestDescAndFn) -> uint { match t.testfn.padding() { - PadNone => 0u, + PadNone => 0, PadOnLeft | PadOnRight => t.desc.name.as_slice().len(), } } @@ -712,12 +712,12 @@ fn should_sort_failures_before_printing_them() { log_out: None, out: Raw(Vec::new()), use_color: false, - total: 0u, - passed: 0u, - failed: 0u, - ignored: 0u, - measured: 0u, - max_name_len: 10u, + total: 0, + passed: 0, + failed: 0, + ignored: 0, + measured: 0, + max_name_len: 10, metrics: MetricMap::new(), failures: vec!((test_b, Vec::new()), (test_a, Vec::new())) }; |
