Skip to content

Remove AttributeLintKind variants - part 5#155590

Merged
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
GuillaumeGomez:rm-attributelintkind
Apr 22, 2026
Merged

Remove AttributeLintKind variants - part 5#155590
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
GuillaumeGomez:rm-attributelintkind

Conversation

@GuillaumeGomez
Copy link
Copy Markdown
Member

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 21, 2026

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

Some changes occurred to diagnostic attributes.

cc @mejrs

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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 21, 2026
Copy link
Copy Markdown
Contributor

@JonathanBrouwer JonathanBrouwer left a comment

Choose a reason for hiding this comment

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

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 21, 2026

📌 Commit 221174d has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Apr 21, 2026
@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 21, 2026
@rust-bors

This comment has been minimized.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 21, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 21, 2026

📌 Commit 80777dd has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 21, 2026
rust-bors Bot pushed a commit that referenced this pull request Apr 21, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - #155546 (Improve E0308 error message for `impl Trait` return mismatches)
 - #152834 (Fix incorrect `let` to `const` suggestion for pattern bindings)
 - #155425 (Remove duplicated `Flags` methods.)
 - #155547 (Use per-parent disambiguators everywhere)
 - #155590 (Remove AttributeLintKind variants - part 5)
rust-timer added a commit that referenced this pull request Apr 22, 2026
Rollup merge of #155590 - GuillaumeGomez:rm-attributelintkind, r=JonathanBrouwer

Remove AttributeLintKind variants - part 5

Part of #153099.

r? @JonathanBrouwer
@rust-bors rust-bors Bot merged commit 79e2ff7 into rust-lang:main Apr 22, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 22, 2026
@GuillaumeGomez GuillaumeGomez deleted the rm-attributelintkind branch April 22, 2026 10:46
@GuillaumeGomez GuillaumeGomez changed the title Remove AttributeLintKind variants - part 5 Remove AttributeLintKind variants - part 5 Apr 22, 2026
@DanielEScherzer
Copy link
Copy Markdown
Contributor

DanielEScherzer commented Apr 29, 2026

@GuillaumeGomez for the 80777dd commit, I'm not sure that it worked as desired - https://thanks.rust-lang.org/rust/1.11.0/ now lists both

  • Guillaume Gomez (rank 8, 37 contributions)
  • ggomez (rank 25, 7 contributions)

compared to before, when it was just one entry

  • Guillaume Gomez (rank 8, 44 contributions)

Did you want separate entries for the two names?

Though maybe #154175 caused the issue rather than this commit, though I can't imagine why

@GuillaumeGomez
Copy link
Copy Markdown
Member Author

@DanielEScherzer It's supposed to be one entry. Did I mess up the .mailmap somehow?

@DanielEScherzer
Copy link
Copy Markdown
Contributor

@DanielEScherzer It's supposed to be one entry. Did I mess up the .mailmap somehow?

I'm not sure - there aren't any warnings in the thanks logs about the mailmap, and I double checked the commit multiple times and don't see anything wrong. Do you want to file an issue on r-l/thanks ?

@GuillaumeGomez
Copy link
Copy Markdown
Member Author

Opened rust-lang/thanks#103.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.

4 participants