bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "Auto merge of #101620 - cjgillot:compute_lint_levels_by_def, r=oli-obk"

Browse source 
This reverts commit 2cb9a65684, reversing
changes made to 750bd1a7ff.
This commit is contained in:
Camille GILLOT 2022-09-20 20:04:35 +02:00
parent 381bd2a836
commit fc43df0333
18 changed files with 497 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,10 +339,9 @@ 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")
.normalize();
.expect("each unstable `LintExpectationId` must have a matching stable id");
stable_id.set_lint_index(lint_index);
*expectation_id = stable_id;

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

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