Skip to content

Commit be74fe5

Browse files
committed
Ignore --diagnostic-width argument when computing hash
1 parent 5b1e93e commit be74fe5

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/compiler/rust.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,7 @@ counted_array!(static ARGS: [ArgInfo<ArgData>; _] = [
10341034
take_arg!("--crate-name", String, CanBeSeparated('='), CrateName),
10351035
take_arg!("--crate-type", ArgCrateTypes, CanBeSeparated('='), CrateType),
10361036
take_arg!("--deny", OsString, CanBeSeparated('='), PassThrough),
1037+
take_arg!("--diagnostic-width", OsString, CanBeSeparated('='), PassThrough),
10371038
take_arg!("--emit", String, CanBeSeparated('='), Emit),
10381039
take_arg!("--error-format", OsString, CanBeSeparated('='), PassThrough),
10391040
take_arg!("--explain", OsString, CanBeSeparated('='), NotCompilation),
@@ -1446,11 +1447,11 @@ where
14461447
let (mut sortables, rest): (Vec<_>, Vec<_>) = os_string_arguments
14471448
.iter()
14481449
// We exclude a few arguments from the hash:
1449-
// -L, --extern, --out-dir
1450+
// -L, --extern, --out-dir, --diagnostic-width
14501451
// These contain paths which aren't relevant to the output, and the compiler inputs
14511452
// in those paths (rlibs and static libs used in the compilation) are used as hash
14521453
// inputs below.
1453-
.filter(|&(arg, _)| !(arg == "--extern" || arg == "-L" || arg == "--out-dir"))
1454+
.filter(|&(arg, _)| !(arg == "--extern" || arg == "-L" || arg == "--out-dir" || arg == "--diagnostic-width"))
14541455
// We also exclude `--target` if it specifies a path to a .json file. The file content
14551456
// is used as hash input below.
14561457
// If `--target` specifies a string, it continues to be hashed as part of the arguments.

0 commit comments

Comments
 (0)