diff options
| author | bors <bors@rust-lang.org> | 2015-04-18 00:48:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-18 00:48:34 +0000 |
| commit | 1284be4044420bc4c41767284ae26be61a38d331 (patch) | |
| tree | e363960cdf71027e69a8a6c35b5c9150c2eefd22 /src/libtest | |
| parent | b08d6cf529a83caec2f408cd8b1287e493ec57ca (diff) | |
| parent | ed437cd8fcbb9ee89849a7eafff94ea97252189e (diff) | |
| download | rust-1284be4044420bc4c41767284ae26be61a38d331.tar.gz rust-1284be4044420bc4c41767284ae26be61a38d331.zip | |
Auto merge of #23985 - erickt:derive-cleanup, r=erickt
This extracts some of the minor cleanup patches from #23905.
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index a9624840f67..5c967747104 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -122,7 +122,6 @@ impl fmt::Display for TestName { #[derive(Clone, Copy)] enum NamePadding { PadNone, - PadOnLeft, PadOnRight, } @@ -130,13 +129,9 @@ impl TestDesc { fn padded_name(&self, column_count: usize, align: NamePadding) -> String { let mut name = String::from_str(self.name.as_slice()); let fill = column_count.saturating_sub(name.len()); - let mut pad = repeat(" ").take(fill).collect::<String>(); + let pad = repeat(" ").take(fill).collect::<String>(); match align { PadNone => name, - PadOnLeft => { - pad.push_str(&name); - pad - } PadOnRight => { name.push_str(&pad); name @@ -690,7 +685,7 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn> ) -> io::Res fn len_if_padded(t: &TestDescAndFn) -> usize { match t.testfn.padding() { PadNone => 0, - PadOnLeft | PadOnRight => t.desc.name.as_slice().len(), + PadOnRight => t.desc.name.as_slice().len(), } } match tests.iter().max_by(|t|len_if_padded(*t)) { |
