Auto merge of #68522 - estebank:impl-trait-sugg-2, r=oli-obk

[rust.git] / src / libtest / formatters / terse.rs

diff --git a/src/libtest/formatters/terse.rs b/src/libtest/formatters/terse.rs
index fe56157d9c10a2624f88f3b846621387daf331eb..5a264d2005744cb54faeef7c8fcbb8a8ebb34b9c 100644 (file)
--- a/src/libtest/formatters/terse.rs
+++ b/src/libtest/formatters/terse.rs
@@ -1,17 +1,14 @@
-use std::{
-    io,
-    io::prelude::Write,
-};
+use std::{io, io::prelude::Write};
 
+use super::OutputFormatter;
 use crate::{
-    types::TestDesc,
-    time,
+    bench::fmt_bench_samples,
+    console::{ConsoleTestState, OutputLocation},
     test_result::TestResult,
+    time,
     types::NamePadding,
-    console::{ConsoleTestState, OutputLocation},
-    bench::fmt_bench_samples,
+    types::TestDesc,
 };
-use super::OutputFormatter;
 
 // insert a '\n' after 100 tests in quiet mode
 const QUIET_MODE_MAX_COLUMN: usize = 100;
@@ -74,7 +71,7 @@ pub fn write_short_result(
             // we insert a new line every 100 dots in order to flush the
             // screen when dealing with line-buffered output (e.g., piping to
             // `stamp` in the rust CI).
-            let out = format!(" {}/{}\n", self.test_count+1, self.total_test_count);
+            let out = format!(" {}/{}\n", self.test_count + 1, self.total_test_count);
             self.write_plain(&out)?;
         }
 
@@ -196,9 +193,9 @@ fn write_result(
     ) -> io::Result<()> {
         match *result {
             TestResult::TrOk => self.write_ok(),
-            TestResult::TrFailed
-                | TestResult::TrFailedMsg(_)
-                | TestResult::TrTimedFail => self.write_failed(),
+            TestResult::TrFailed | TestResult::TrFailedMsg(_) | TestResult::TrTimedFail => {
+                self.write_failed()
+            }
             TestResult::TrIgnored => self.write_ignored(),
             TestResult::TrAllowedFail => self.write_allowed_fail(),
             TestResult::TrBench(ref bs) => {
@@ -214,7 +211,8 @@ fn write_result(
     fn write_timeout(&mut self, desc: &TestDesc) -> io::Result<()> {
         self.write_plain(&format!(
             "test {} has been running for over {} seconds\n",
-            desc.name, time::TEST_WARN_TIMEOUT_S
+            desc.name,
+            time::TEST_WARN_TIMEOUT_S
         ))
     }