Skip to content

Commit 37ffb94

Browse files
author
Orion Gonzalez
committed
update CONFIG_CHANGE_HISTORY
1 parent ef4325e commit 37ffb94

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

Diff for: src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -280,4 +280,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
280280
severity: ChangeSeverity::Info,
281281
summary: "Allow setting `--jobs` in config.toml with `build.jobs`.",
282282
},
283+
ChangeInfo {
284+
change_id: 131181,
285+
severity: ChangeSeverity::Info,
286+
summary: "New option `build.compiletest-diff-tool` that adds support for a custom differ for compiletest",
287+
},
283288
];

Diff for: src/tools/compiletest/src/lib.rs

+6-2
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" {

Diff for: src/tools/compiletest/src/runtest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2534,7 +2534,7 @@ impl<'test> TestCx<'test> {
25342534
));
25352535
}
25362536
Ok(output) => {
2537-
let output = String::from_utf8_lossy_owned(output.stdout).unwrap();
2537+
let output = String::from_utf8_lossy(&output.stdout);
25382538
print!("{output}");
25392539
}
25402540
}

0 commit comments

Comments
 (0)