fixup! Add normalization for thread IDs in panic messages

Author: tgross35

tests/run-make/libtest-json/rmake.rs

@@ -38,9 +38,6 @@ fn run_tests(extra_args: &[&str], expected_file: &str) {
         .expected_file(expected_file)
         .actual_text("stdout", test_stdout)
         .normalize(r#"(?<prefix>"exec_time": )[0-9.]+"#, r#"${prefix}"$$EXEC_TIME""#)
-        .normalize(
-            r"thread '(?P<name>.*?)' \(\d+\) panicked",
-            "thread '$name' ($$TID) panicked",
-        )
+        .normalize(r"thread '(?P<name>.*?)' \(\d+\) panicked", "thread '$name' ($$TID) panicked")
         .run();
 }

tests/run-make/libtest-junit/rmake.rs

@@ -27,9 +27,6 @@ fn run_tests(extra_args: &[&str], expected_file: &str) {
         .expected_file(expected_file)
         .actual_text("stdout", test_stdout)
         .normalize(r#"\btime="[0-9.]+""#, r#"time="$$TIME""#)
-        .normalize(
-            r"thread '(?P<name>.*?)' \(\d+\) panicked",
-            "thread '$name' ($$TID) panicked",
-        )
+        .normalize(r"thread '(?P<name>.*?)' \(\d+\) panicked", "thread '$name' ($$TID) panicked")
         .run();
 }