Skip to content

Commit a6bc7e4

Browse files
author
Orion Gonzalez
committed
update CONFIG_CHANGE_HISTORY
1 parent 0f03576 commit a6bc7e4

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
270270
severity: ChangeSeverity::Info,
271271
summary: "If `llvm.download-ci-llvm` is not defined, it defaults to `true`.",
272272
},
273+
ChangeInfo {
274+
change_id: 131181,
275+
severity: ChangeSeverity::Info,
276+
summary: "New option `build.display-diff-tool` that adds support for a custom differ for compiletests",
277+
},
273278
];

src/tools/compiletest/src/lib.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,12 @@ pub fn parse_config(args: Vec<String>) -> Config {
172172
"email address used for finding merge commits",
173173
"EMAIL",
174174
)
175-
.optopt("", "display-diff-tool", "What custom diff tool to use for displaying compiletest tests.", "COMMAND")
176-
;
175+
.optopt(
176+
"",
177+
"display-diff-tool",
178+
"What custom diff tool to use for displaying compiletest tests.",
179+
"COMMAND",
180+
);
177181

178182
let (argv0, args_) = args.split_first().unwrap();
179183
if args.len() == 1 || args[1] == "-h" || args[1] == "--help" {

src/tools/compiletest/src/runtest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2555,7 +2555,7 @@ impl<'test> TestCx<'test> {
25552555
));
25562556
}
25572557
Ok(output) => {
2558-
let output = String::from_utf8_lossy_owned(output.stdout).unwrap();
2558+
let output = String::from_utf8_lossy(&output.stdout);
25592559
print!("{output}");
25602560
}
25612561
}

0 commit comments

Comments
 (0)