Rollup merge of #95740 - Amanieu:kreg0, r=nagisa

[rust.git] / library / test / src / formatters / pretty.rs

diff --git a/library/test/src/formatters/pretty.rs b/library/test/src/formatters/pretty.rs
index 023c0174c4f3f8f959e3adbf163f80b918479ce7..694202229802f832fd5cab66db22c2464f8077e4 100644 (file)
--- a/library/test/src/formatters/pretty.rs
+++ b/library/test/src/formatters/pretty.rs
@@ -66,7 +66,7 @@ pub fn write_short_result(
         result: &str,
         color: term::color::Color,
     ) -> io::Result<()> {
-        self.write_pretty(result.as_ref(), color)
+        self.write_pretty(result, color)
     }
 
     pub fn write_pretty(&mut self, word: &str, color: term::color::Color) -> io::Result<()> {
@@ -218,12 +218,7 @@ fn write_result(
         match *result {
             TestResult::TrOk => self.write_ok()?,
             TestResult::TrFailed | TestResult::TrFailedMsg(_) => self.write_failed()?,
-            TestResult::TrIgnored => {
-                #[cfg(not(bootstrap))]
-                self.write_ignored(desc.ignore_message)?;
-                #[cfg(bootstrap)]
-                self.write_ignored(None)?;
-            }
+            TestResult::TrIgnored => self.write_ignored(desc.ignore_message)?,
             TestResult::TrBench(ref bs) => {
                 self.write_bench()?;
                 self.write_plain(&format!(": {}", fmt_bench_samples(bs)))?;