[nextest-runner] update to quick-junit 0.5.0

This results in some nice code cleanup.

Author: sunshowers

Cargo.lock

@@ -28,7 +28,7 @@ owo-colors = { version = "4.0.0", features = ["supports-colors"] }
 newtype-uuid = { version = "1.1.0", features = ["v4"] }
 nextest-metadata = { version = "0.12.0", path = "nextest-metadata" }
 nextest-workspace-hack = "0.1.0"
-quick-junit = "0.4.0"
+quick-junit = "0.5.0"
 swrite = "0.1.0"
 target-spec = { version = "3.2.1", features = ["custom", "summaries"] }
 target-spec-miette = "0.4.0"

Cargo.toml

@@ -14,7 +14,9 @@ use crate::{
 };
 use camino::Utf8PathBuf;
 use debug_ignore::DebugIgnore;
-use quick_junit::{NonSuccessKind, Report, TestCase, TestCaseStatus, TestRerun, TestSuite};
+use quick_junit::{
+    NonSuccessKind, Report, TestCase, TestCaseStatus, TestRerun, TestSuite, XmlString,
+};
 use std::{borrow::Cow, collections::HashMap, fs::File};
 
 #[derive(Clone, Debug)]
@@ -245,7 +247,7 @@ enum TestcaseOrRerun<'a> {
 }
 
 impl TestcaseOrRerun<'_> {
-    fn set_message(&mut self, message: impl Into<String>) -> &mut Self {
+    fn set_message(&mut self, message: impl Into<XmlString>) -> &mut Self {
         match self {
             TestcaseOrRerun::Testcase(testcase) => {
                 testcase.status.set_message(message.into());
@@ -257,7 +259,7 @@ impl TestcaseOrRerun<'_> {
         self
     }
 
-    fn set_description(&mut self, description: impl Into<String>) -> &mut Self {
+    fn set_description(&mut self, description: impl Into<XmlString>) -> &mut Self {
         match self {
             TestcaseOrRerun::Testcase(testcase) => {
                 testcase.status.set_description(description.into());
@@ -269,7 +271,7 @@ impl TestcaseOrRerun<'_> {
         self
     }
 
-    fn set_system_out(&mut self, system_out: impl Into<String>) -> &mut Self {
+    fn set_system_out(&mut self, system_out: impl Into<XmlString>) -> &mut Self {
         match self {
             TestcaseOrRerun::Testcase(testcase) => {
                 testcase.set_system_out(system_out.into());
@@ -281,7 +283,7 @@ impl TestcaseOrRerun<'_> {
         self
     }
 
-    fn set_system_err(&mut self, system_err: impl Into<String>) -> &mut Self {
+    fn set_system_err(&mut self, system_err: impl Into<XmlString>) -> &mut Self {
         match self {
             TestcaseOrRerun::Testcase(testcase) => {
                 testcase.set_system_err(system_err.into());
@@ -305,7 +307,7 @@ fn set_execute_status_props(
             if !is_success {
                 let description = output.heuristic_extract_description(execute_status.result);
                 if let Some(description) = description {
-                    out.set_description(description.display_human().to_junit_output());
+                    out.set_description(description.display_human().to_string());
                 }
             }
 

nextest-runner/src/reporter/aggregator.rs

@@ -4,7 +4,6 @@
 use crate::runner::{AbortStatus, ExecutionResult};
 use bstr::ByteSlice;
 use once_cell::sync::Lazy;
-use quick_junit::Output;
 use regex::bytes::{Regex, RegexBuilder};
 use std::fmt;
 
@@ -121,15 +120,6 @@ pub struct ByteSubslice<'a> {
 #[derive(Clone, Copy, Debug)]
 pub struct DescriptionKindDisplay<'a>(DescriptionKind<'a>);
 
-impl<'a> DescriptionKindDisplay<'a> {
-    /// Returns the displayer in a JUnit-compatible format.
-    ///
-    /// This format filters out invalid XML characters.
-    pub fn to_junit_output(self) -> Output {
-        Output::new(self.to_string())
-    }
-}
-
 impl fmt::Display for DescriptionKindDisplay<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.0 {