Skip to content

Ignore --diagnostic-width argument when computing hash #2424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

Ignore --diagnostic-width argument when computing hash #2424

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f71bac
Ignore --diagnostic-width argument when computing hash
shadaj Jul 24, 2025
7ae50e2
Add --diagnostic-width to test for args ignored in hash
shadaj Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/compiler/rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,7 @@ counted_array!(static ARGS: [ArgInfo<ArgData>; _] = [
take_arg!("--crate-name", String, CanBeSeparated('='), CrateName),
take_arg!("--crate-type", ArgCrateTypes, CanBeSeparated('='), CrateType),
take_arg!("--deny", OsString, CanBeSeparated('='), PassThrough),
take_arg!("--diagnostic-width", OsString, CanBeSeparated('='), PassThrough),
take_arg!("--emit", String, CanBeSeparated('='), Emit),
take_arg!("--error-format", OsString, CanBeSeparated('='), PassThrough),
take_arg!("--explain", OsString, CanBeSeparated('='), NotCompilation),
Expand Down Expand Up @@ -1452,11 +1453,16 @@ where
let (mut sortables, rest): (Vec<_>, Vec<_>) = os_string_arguments
.iter()
// We exclude a few arguments from the hash:
// -L, --extern, --out-dir
// -L, --extern, --out-dir, --diagnostic-width
// These contain paths which aren't relevant to the output, and the compiler inputs
// in those paths (rlibs and static libs used in the compilation) are used as hash
// inputs below.
.filter(|&(arg, _)| !(arg == "--extern" || arg == "-L" || arg == "--out-dir"))
.filter(|&(arg, _)| {
!(arg == "--extern"
|| arg == "-L"
|| arg == "--out-dir"
|| arg == "--diagnostic-width")
})
// We also exclude `--target` if it specifies a path to a .json file. The file content
// is used as hash input below.
// If `--target` specifies a string, it continues to be hashed as part of the arguments.
Expand Down Expand Up @@ -3716,6 +3722,7 @@ proc_macro false
"foo.rs",
"--out-dir",
"out",
"--diagnostic-width=1",
"--extern",
"a=1",
"--crate-name",
Expand Down
Loading