diff --git a/library/test/src/formatters/json.rs b/library/test/src/formatters/json.rs index 7b039164f48c7..737921c1e10dc 100644 --- a/library/test/src/formatters/json.rs +++ b/library/test/src/formatters/json.rs @@ -122,25 +122,17 @@ impl OutputFormatter for JsonFormatter { TestResult::TrIgnored => { #[cfg(not(bootstrap))] - if let Some(msg) = desc.ignore_message { - self.write_event( - "test", - desc.name.as_slice(), - "ignored", - exec_time, - stdout, - Some(&*format!(r#""message": "{}""#, EscapedString(msg))), - ) - } else { - self.write_event( - "test", - desc.name.as_slice(), - "ignored", - exec_time, - stdout, - None, - ) - } + return self.write_event( + "test", + desc.name.as_slice(), + "ignored", + exec_time, + stdout, + desc.ignore_message + .map(|msg| format!(r#""message": "{}""#, EscapedString(msg))) + .as_deref(), + ); + #[cfg(bootstrap)] self.write_event("test", desc.name.as_slice(), "ignored", exec_time, stdout, None) } diff --git a/library/test/src/formatters/pretty.rs b/library/test/src/formatters/pretty.rs index f05c543498f5f..023c0174c4f3f 100644 --- a/library/test/src/formatters/pretty.rs +++ b/library/test/src/formatters/pretty.rs @@ -45,8 +45,8 @@ impl PrettyFormatter { self.write_short_result("FAILED", term::color::RED) } - pub fn write_ignored(&mut self, may_message: Option<&'static str>) -> io::Result<()> { - if let Some(message) = may_message { + pub fn write_ignored(&mut self, message: Option<&'static str>) -> io::Result<()> { + if let Some(message) = message { self.write_short_result(&format!("ignored, {}", message), term::color::YELLOW) } else { self.write_short_result("ignored", term::color::YELLOW) @@ -63,7 +63,7 @@ impl PrettyFormatter { pub fn write_short_result( &mut self, - result: impl AsRef, + result: &str, color: term::color::Color, ) -> io::Result<()> { self.write_pretty(result.as_ref(), color)