mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #87145 - jsgf:fix-lint-opt-hash, r=michaelwoerister

Browse Source 
Make --cap-lints and related options leave crate hash alone

Closes: #87144
This commit is contained in:
Guillaume Gomez 2021-07-16 10:08:07 +02:00 committed by GitHub
commit c1b9bbf1e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/rustc_interface/src/tests.rs
View File

@ -236,9 +236,9 @@ fn test_lints_tracking_hash_different_values() {
(String::from("d"), Level::Deny), (String::from("d"), Level::Deny),
]; ];
assert_different_hash(&v1, &v2); assert_non_crate_hash_different(&v1, &v2);
assert_different_hash(&v1, &v3); assert_non_crate_hash_different(&v1, &v3);
assert_different_hash(&v2, &v3); assert_non_crate_hash_different(&v2, &v3);
} }
#[test] #[test]
@ -261,7 +261,21 @@ fn test_lints_tracking_hash_different_construction_order() {
]; ];
// The hash should be order-dependent // The hash should be order-dependent
assert_different_hash(&v1, &v2); assert_non_crate_hash_different(&v1, &v2);
}
#[test]
fn test_lint_cap_hash_different() {
let mut v1 = Options::default();
let mut v2 = Options::default();
let v3 = Options::default();
v1.lint_cap = Some(Level::Forbid);
v2.lint_cap = Some(Level::Allow);
assert_non_crate_hash_different(&v1, &v2);
assert_non_crate_hash_different(&v1, &v3);
assert_non_crate_hash_different(&v2, &v3);
} }
#[test] #[test]

6
compiler/rustc_session/src/options.rs
View File

@ -133,9 +133,9 @@ top_level_options!(
/// can influence whether overflow checks are done or not. /// can influence whether overflow checks are done or not.
debug_assertions: bool [TRACKED], debug_assertions: bool [TRACKED],
debuginfo: DebugInfo [TRACKED], debuginfo: DebugInfo [TRACKED],
lint_opts: Vec<(String, lint::Level)> [TRACKED], lint_opts: Vec<(String, lint::Level)> [TRACKED_NO_CRATE_HASH],
lint_cap: Option<lint::Level> [TRACKED], lint_cap: Option<lint::Level> [TRACKED_NO_CRATE_HASH],
force_warns: Vec<String> [TRACKED], force_warns: Vec<String> [TRACKED_NO_CRATE_HASH],
describe_lints: bool [UNTRACKED], describe_lints: bool [UNTRACKED],
output_types: OutputTypes [TRACKED], output_types: OutputTypes [TRACKED],
search_paths: Vec<SearchPath> [UNTRACKED], search_paths: Vec<SearchPath> [UNTRACKED],