diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-23 22:19:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 22:19:07 +0200 |
| commit | 426c6cf84fd6230240abe5e2e9007fcc7d1cddff (patch) | |
| tree | 43c4e608acb09219bd63e59d10a00d3661fe2cdb /src/libtest | |
| parent | 4a8c5b20c7772bc5342b83d4b0696ea216ef75a7 (diff) | |
| parent | bedbf3bacbff36a477dcf28523cbf6cab67e9e0a (diff) | |
Rollup merge of #64178 - mati865:clippy, r=scottmcm
More Clippy fixes for alloc, core and std Continuation of https://github.com/rust-lang/rust/pull/63805
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/bench.rs | 4 | ||||
| -rw-r--r-- | src/libtest/cli.rs | 2 | ||||
| -rw-r--r-- | src/libtest/console.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libtest/bench.rs b/src/libtest/bench.rs index c142c5213d2..c86bfd16c21 100644 --- a/src/libtest/bench.rs +++ b/src/libtest/bench.rs @@ -48,7 +48,7 @@ impl Bencher { F: FnMut(&mut Bencher), { f(self); - return self.summary; + self.summary } } @@ -116,7 +116,7 @@ where for _ in 0..k { black_box(inner()); } - return ns_from_dur(start.elapsed()); + ns_from_dur(start.elapsed()) } pub fn iter<T, F>(inner: &mut F) -> stats::Summary diff --git a/src/libtest/cli.rs b/src/libtest/cli.rs index f95d5aad18a..a34426305be 100644 --- a/src/libtest/cli.rs +++ b/src/libtest/cli.rs @@ -149,7 +149,7 @@ fn optgroups() -> getopts::Options { `CRITICAL_TIME` here means the limit that should not be exceeded by test. " ); - return opts; + opts } fn usage(binary: &str, options: &getopts::Options) { diff --git a/src/libtest/console.rs b/src/libtest/console.rs index e17030726ce..244cbd2cf5f 100644 --- a/src/libtest/console.rs +++ b/src/libtest/console.rs @@ -296,7 +296,7 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> io::Resu assert!(st.current_test_count() == st.total); - return out.write_run_finish(&st); + out.write_run_finish(&st) } // Calculates padding for given test description. |
