bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Compute lint_levels by definition

Browse source
This commit is contained in:
Deadbeef 2022-07-22 16:48:36 +00:00 • committed by Camille GILLOT
parent 6019cbbfd3
commit 3cb1811e45
13 changed files with 482 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_errors/src/diagnostic.rs
View file

@ -364,9 +364,10 @@ impl Diagnostic {
// The lint index inside the attribute is manually transferred here.
let lint_index = expectation_id.get_lint_index();
expectation_id.set_lint_index(None);
let mut stable_id = *unstable_to_stable
let mut stable_id = unstable_to_stable
.get(&expectation_id)
.expect("each unstable `LintExpectationId` must have a matching stable id");
.expect("each unstable `LintExpectationId` must have a matching stable id")
.normalize();
stable_id.set_lint_index(lint_index);
*expectation_id = stable_id;

2
compiler/rustc_errors/src/lib.rs
View file

@ -1211,7 +1211,7 @@ impl HandlerInner {
if let Some(expectation_id) = diagnostic.level.get_expectation_id() {
self.suppressed_expected_diag = true;
self.fulfilled_expectations.insert(expectation_id);
self.fulfilled_expectations.insert(expectation_id.normalize());
}
if matches!(diagnostic.level, Warning(_))