update CONFIG_CHANGE_HISTORY

src/bootstrap/src/utils/change_tracker.rs

@@ -280,4 +280,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
         severity: ChangeSeverity::Info,
         summary: "Allow setting `--jobs` in config.toml with `build.jobs`.",
     },
+    ChangeInfo {
+        change_id: 131181,
+        severity: ChangeSeverity::Info,
+        summary: "New option `build.compiletest-diff-tool` that adds support for a custom differ for compiletest",
+    },
 ];

src/tools/compiletest/src/lib.rs

@@ -176,8 +176,12 @@ pub fn parse_config(args: Vec<String>) -> Config {
             "email address used for finding merge commits",
             "EMAIL",
         )
-        .optopt("", "display-diff-tool", "What custom diff tool to use for displaying compiletest tests.", "COMMAND")
-    ;
+        .optopt(
+            "",
+            "display-diff-tool",
+            "What custom diff tool to use for displaying compiletest tests.",
+            "COMMAND",
+        );
 
     let (argv0, args_) = args.split_first().unwrap();
     if args.len() == 1 || args[1] == "-h" || args[1] == "--help" {

src/tools/compiletest/src/runtest.rs

@@ -2534,7 +2534,7 @@ impl<'test> TestCx<'test> {
                             ));
                         }
                         Ok(output) => {
-                            let output = String::from_utf8_lossy_owned(output.stdout).unwrap();
+                            let output = String::from_utf8_lossy(&output.stdout);
                             print!("{output}");
                         }
                     }