Rollup merge of #77389 - jyn514:THE-PAPERCLIP-COMETH, r=Mark-Simulacrum

Fix some clippy lints

Found while working on https://github.com/rust-lang/rust/pull/77351;
these are just the ones that could be fixed automatically.
This commit is contained in:
Yuki Okushi
2020-10-02 08:25:24 +09:00
committed by GitHub
5 changed files with 8 additions and 10 deletions
+1 -1
View File
@@ -159,7 +159,7 @@ pub fn iter<T, F>(inner: &mut F) -> stats::Summary
return summ5;
}
total_run = total_run + loop_run;
total_run += loop_run;
// Longest we ever run for is 3s.
if total_run > Duration::from_secs(3) {
return summ5;
+1 -1
View File
@@ -139,7 +139,7 @@ fn write_results(
stdouts.push_str(&format!("---- {} stdout ----\n", f.name));
let output = String::from_utf8_lossy(stdout);
stdouts.push_str(&output);
stdouts.push_str("\n");
stdouts.push('\n');
}
}
if !stdouts.is_empty() {
+2 -2
View File
@@ -114,7 +114,7 @@ pub fn write_outputs(&mut self, state: &ConsoleTestState) -> io::Result<()> {
stdouts.push_str(&format!("---- {} stdout ----\n", f.name));
let output = String::from_utf8_lossy(stdout);
stdouts.push_str(&output);
stdouts.push_str("\n");
stdouts.push('\n');
}
}
if !stdouts.is_empty() {
@@ -140,7 +140,7 @@ pub fn write_failures(&mut self, state: &ConsoleTestState) -> io::Result<()> {
fail_out.push_str(&format!("---- {} stdout ----\n", f.name));
let output = String::from_utf8_lossy(stdout);
fail_out.push_str(&output);
fail_out.push_str("\n");
fail_out.push('\n');
}
}
if !fail_out.is_empty() {
+3 -5
View File
@@ -237,11 +237,9 @@ pub fn run_tests<F>(
let event = TestEvent::TeFiltered(filtered_descs);
notify_about_test_event(event)?;
let (filtered_tests, filtered_benchs): (Vec<_>, _) =
filtered_tests.into_iter().partition(|e| match e.testfn {
StaticTestFn(_) | DynTestFn(_) => true,
_ => false,
});
let (filtered_tests, filtered_benchs): (Vec<_>, _) = filtered_tests
.into_iter()
.partition(|e| matches!(e.testfn, StaticTestFn(_) | DynTestFn(_)));
let concurrency = opts.test_threads.unwrap_or_else(get_concurrency);
+1 -1
View File
@@ -199,7 +199,7 @@ fn var(&self) -> f64 {
let mut v: f64 = 0.0;
for s in self {
let x = *s - mean;
v = v + x * x;
v += x * x;
}
// N.B., this is _supposed to be_ len-1, not len. If you
// change it back to len, you will be calculating a