Skip to content

Commit f6b8b49

Browse files
author
Orion Gonzalez
committed
update CONFIG_CHANGE_HISTORY
1 parent a9756d5 commit f6b8b49

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/bootstrap/src/utils/change_tracker.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
275275
severity: ChangeSeverity::Info,
276276
summary: "New option `./x setup editor` added, replacing `./x setup vscode` and adding support for vim, emacs and helix.",
277277
},
278+
ChangeInfo {
279+
change_id: 131181,
280+
severity: ChangeSeverity::Info,
281+
summary: "New option `build.compiletest-diff-tool` that adds support for a custom differ for compiletest",
282+
},
278283
];

src/tools/compiletest/src/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,12 @@ pub fn parse_config(args: Vec<String>) -> Config {
176176
"email address used for finding merge commits",
177177
"EMAIL",
178178
)
179-
.optopt("", "display-diff-tool", "What custom diff tool to use for displaying compiletest tests.", "COMMAND")
180-
;
179+
.optopt(
180+
"",
181+
"display-diff-tool",
182+
"What custom diff tool to use for displaying compiletest tests.",
183+
"COMMAND",
184+
);
181185

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

src/tools/compiletest/src/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2524,7 +2524,7 @@ impl<'test> TestCx<'test> {
25242524
));
25252525
}
25262526
Ok(output) => {
2527-
let output = String::from_utf8_lossy_owned(output.stdout).unwrap();
2527+
let output = String::from_utf8_lossy(&output.stdout);
25282528
print!("{output}");
25292529
}
25302530
}

0 commit comments

Comments
 (0)