Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only include lint in future_incompatible lint group if not an edition lint #86689

Merged
merged 2 commits into from
Jun 30, 2021

Conversation

rylev
Copy link
Member

@rylev rylev commented Jun 28, 2021

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 28, 2021
@m-ou-se m-ou-se added A-diagnostics Area: Messages for errors, warnings, and lints D-edition Diagnostics: An error or lint that should account for edition differences. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 28, 2021
@rylev rylev requested a review from nikomatsakis June 28, 2021 15:42
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 29, 2021

📌 Commit f0d7280 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 29, 2021
@bors
Copy link
Contributor

bors commented Jun 30, 2021

⌛ Testing commit f0d7280 with merge 51fd129...

@bors
Copy link
Contributor

bors commented Jun 30, 2021

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 51fd129 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 30, 2021
@bors bors merged commit 51fd129 into rust-lang:master Jun 30, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 30, 2021
@rylev rylev deleted the future-compat-lint-group branch July 1, 2021 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-diagnostics Area: Messages for errors, warnings, and lints D-edition Diagnostics: An error or lint that should account for edition differences. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants