bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Expect each lint in attribute individually (RFC-2383)

Browse source
This commit is contained in:
xFrednet 2021-11-24 21:57:38 +01:00
parent a9bf9eaef5
commit aa2a0a83d9
No known key found for this signature in database
GPG key ID: FCDCBF29AF64D601
12 changed files with 210 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -942,10 +942,16 @@ impl Handler {
let mut inner = self.inner.borrow_mut();
for mut diag in diags.into_iter() {
if let Some(unstable_id) = diag.level.get_expectation_id() {
if let Some(stable_id) = unstable_to_stable.get(&unstable_id) {
diag.level = Level::Expect(*stable_id);
inner.fulfilled_expectations.insert(*stable_id);
if let Some(mut unstable_id) = diag.level.get_expectation_id() {
let lint_index = unstable_id.get_lint_index();
// The unstable to stable map only maps the unstable it to a stable id
// the lint index is manually transferred here.
unstable_id.set_lint_index(None);
if let Some(mut stable_id) = unstable_to_stable.get(&unstable_id).map(|id| *id) {
stable_id.set_lint_index(lint_index);
diag.level = Level::Expect(stable_id);
inner.fulfilled_expectations.insert(stable_id);
}
}
@ -1007,7 +1013,7 @@ impl HandlerInner {
// Diagnostics created before the definition of `HirId`s are unstable and can not yet
// be stored. Instead, they are buffered until the `LintExpectationId` is replaced by
// a stable one by the `LintLevelsBuilder`.
if let Level::Expect(LintExpectationId::Unstable(_)) = diagnostic.level {
if let Level::Expect(LintExpectationId::Unstable { .. }) = diagnostic.level {
self.unstable_expect_diagnostics.push(diagnostic.clone());
return;
}