diff options
| -rw-r--r-- | src/bootstrap/src/utils/change_tracker.rs | 5 | ||||
| -rw-r--r-- | src/tools/compiletest/src/lib.rs | 8 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/bootstrap/src/utils/change_tracker.rs b/src/bootstrap/src/utils/change_tracker.rs index 9169bc90a45..fac24572a87 100644 --- a/src/bootstrap/src/utils/change_tracker.rs +++ b/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", + }, ]; diff --git a/src/tools/compiletest/src/lib.rs b/src/tools/compiletest/src/lib.rs index debc59109e7..a008410e34b 100644 --- a/src/tools/compiletest/src/lib.rs +++ b/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" { diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 4aca3b34313..7db37af60d2 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/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}"); } } |