bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #86689 - rylev:future-compat-lint-group, r=nikomatsakis

Browse source 
Only include lint in future_incompatible lint group if not an edition lint

A follow up to #86330 - this only includes lints annotated with `FutureIncompatibleInfo` in the `future_incompatibile` lint group if the future compatibility is not tied to an edition.

We probably want to rename `FutureIncompatibleInfo` to something else since this type is now used to indicate future breakages of all kinds (even those that happen in editions). I'd prefer to do that in a separate PR though.

r? `@nikomatsakis`
This commit is contained in:
bors 2021-06-30 05:02:01 +00:00
commit 51fd129ac1
3 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_lint/src/context.rs
View file

@ -220,17 +220,20 @@ impl LintStore {
})
.lint_ids
.push(id);
} else {
// Lints belonging to the `future_incompatible` lint group are lints where a
// future version of rustc will cause existing code to stop compiling.
// Lints tied to an edition don't count because they are opt-in.
self.lint_groups
.entry("future_incompatible")
.or_insert(LintGroup {
lint_ids: vec![],
from_plugin: lint.is_plugin,
depr: None,
})
.lint_ids
.push(id);
}
self.lint_groups
.entry("future_incompatible")
.or_insert(LintGroup {
lint_ids: vec![],
from_plugin: lint.is_plugin,
depr: None,
})
.lint_ids
.push(id);
}
}
}