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.

Sign up for GitHub

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

Jump to bottom

Deny gen keyword in edition_2024_compat lints #123680

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Deny gen keyword in edition_2024_compat lints #123680

merged 1 commit into from
Apr 23, 2024

Conversation

compiler-errors
Copy link
Member

Splits the keyword_idents lint into two -- keyword_idents_2018 and keyword_idents_2024 -- since each corresponds to a future-compat warning in a different edition. Group these together into a new keyword_idents lint group, and add the latter to the rust_2024_compatibility so that gen is ready for the 2024 edition.

cc @traviscross @ehuss

@rustbot
Copy link
Collaborator

rustbot commented Apr 9, 2024

r? @Nadrieril

rustbot has assigned @Nadrieril.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 9, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member Author

@ehuss: Do you know what's the order of operations for fixing things in the edition-guide submodule?

Seems like I need to fix the guide to point to keyword-idents-2018/keyword-idents-2024 since there is no individual lint named ``keyword-idents` anymore, but I can't update this at the same time, right? (that's not how submodules work, right??)

@ehuss
Copy link
Contributor

ehuss commented Apr 9, 2024

Hm, I don't think we've had a situation quite like this. Ideally the links shouldn't be broken, since there can be other pages outside of our docs linking to it.

My instinct would be to add a short-term solution to the lint-docs tool to redirect renamed lints to the new location, and to just manually list those for now. I can probably put that together.

The longer term thinking is to embed all the lint data and docs in rustc and have a -Z flag to extract the information instead of the current system which just slurps from the rust source code. Then rustc could tell the lint docs tool about renamed and removed lints.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
Nadrieril
Nadrieril reviewed Apr 10, 2024
View reviewed changes
Copy link
Member

@Nadrieril Nadrieril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implementation looks good. Is it just the guide submodule left to figure out?

@compiler-errors
Copy link
Member Author

Yup

@Nadrieril
Copy link
Member

Ok. r=me when you figure that out

@ehuss ehuss mentioned this pull request Apr 15, 2024
Merged
@ehuss
Copy link
Contributor

ehuss commented Apr 15, 2024

Opened #123986 to unblock this.

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Apr 20, 2024
@jieyouxu
Rollup merge of rust-lang#123986 - ehuss:lint-renamed, r=Mark-Simulacrum
6be1d23 
lint-docs: Add redirects for renamed lints.

This updates the lint docs to include a redirect for renamed lints to the new name. This helps ensure that links to the old name will still be valid.

Note that this currently uses a hard-coded list. As mentioned in the comment, a future enhancement may gather this information in a better way.

Unblocks rust-lang#123680
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Apr 20, 2024
@jieyouxu
Rollup merge of rust-lang#123986 - ehuss:lint-renamed, r=Mark-Simulacrum
871c3e3 
lint-docs: Add redirects for renamed lints.

This updates the lint docs to include a redirect for renamed lints to the new name. This helps ensure that links to the old name will still be valid.

Note that this currently uses a hard-coded list. As mentioned in the comment, a future enhancement may gather this information in a better way.

Unblocks rust-lang#123680
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 21, 2024
@rust-timer
Unrolled build for rust-lang#123986
0de5faf 
Rollup merge of rust-lang#123986 - ehuss:lint-renamed, r=Mark-Simulacrum

lint-docs: Add redirects for renamed lints.

This updates the lint docs to include a redirect for renamed lints to the new name. This helps ensure that links to the old name will still be valid.

Note that this currently uses a hard-coded list. As mentioned in the comment, a future enhancement may gather this information in a better way.

Unblocks rust-lang#123680
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Nadrieril
Copy link
Member

Is this ready now?

@compiler-errors
Copy link
Member Author

Yup!

@bors r=Nadrieril

@bors
Copy link
Contributor

bors commented Apr 22, 2024

📌 Commit 7789874 has been approved by Nadrieril

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 22, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 22, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2024
@bors
Auto merge of rust-lang#124277 - matthiaskrgr:rollup-zdb93i4, r=matth…
c672773 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#123680 (Deny gen keyword in `edition_2024_compat` lints)
 - rust-lang#124057 (Fix ICE when ADT tail has type error)
 - rust-lang#124168 (Use `DefiningOpaqueTypes::Yes` in rustdoc, where the `InferCtxt` is guaranteed to have no opaque types it can define)
 - rust-lang#124197 (Move duplicated code in functions in `tests/rustdoc-gui/notable-trait.goml`)
 - rust-lang#124200 (Improve handling of expr->field errors)
 - rust-lang#124220 (Miri: detect wrong vtables in wide pointers)
 - rust-lang#124266 (remove an unused type from the reentrant lock tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d5cfc5c into rust-lang:master Apr 23, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2024
@rust-timer
Unrolled build for rust-lang#123680
e9e84c6 
Rollup merge of rust-lang#123680 - compiler-errors:gen-kw, r=Nadrieril

Deny gen keyword in `edition_2024_compat` lints

Splits the `keyword_idents` lint into two -- `keyword_idents_2018` and `keyword_idents_2024` -- since each corresponds to a future-compat warning in a different edition. Group these together into a new `keyword_idents` lint group, and add the latter to the `rust_2024_compatibility` so that `gen` is ready for the 2024 edition.

cc `@traviscross` `@ehuss`
@ehuss ehuss mentioned this pull request Apr 23, 2024
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PatchMixolydic PatchMixolydic PatchMixolydic left review comments

@Nadrieril Nadrieril Nadrieril left review comments

Assignees

@Nadrieril Nadrieril

Labels
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
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.
7 participants
@compiler-errors @rustbot @rust-log-analyzer @ehuss @Nadrieril @bors @PatchMixolydic