Uh oh!
There was an error while loading. Please reload this page.
Refactor CheckAttrVisitor so rustfmt can format it. - #156466
Merged
Merged
Conversation
The key change is that the do-nothing cases are now individual match arms instead of an enormous or-pattern. In order to achieve this cleanly, I moved the code handling `Attribute::Parsed` into a separate function matching `AttributeKind`s rather than `Attribute`s. This also fixes `RustcAllowIncoherentImpl` being non-alphabetical because it was spelled without a leading “|”.
rustbot
commented
May 11, 2026
Collaborator
Some changes occurred in compiler/rustc_passes/src/check_attr.rs |
rustbot
commented
May 11, 2026
Collaborator
r? @nnethercote rustbot has assigned @nnethercote. Use Why was this reviewer chosen?The reviewer was selected based on:
|
JonathanBrouwer
approved these changes
May 11, 2026
Member
There was a problem hiding this comment.
@bors r+ rollup
Thanks, this is prettier regardless of rustfmt issues
Contributor
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
May 11, 2026
Refactor `CheckAttrVisitor` so rustfmt can format it. I don’t have any need for this myself, but [I heard it was annoying people](https://rust-lang.zulipchat.com/#narrow/channel/147480-t-compiler.2Fdiagnostics/topic/.60.23.5Bdiagnostic.3A.3Aon_unimplemented.5D.60.20on.20trait.20methods.3F/near/594113991) and I like fixing formatting and structure problems. The key change is that the do-nothing cases are now individual match arms instead of an enormous or-pattern. In order to achieve this cleanly, I moved the code handling `Attribute::Parsed` into a separate function matching `AttributeKind`s rather than `Attribute`s. This also fixes `RustcAllowIncoherentImpl` being non-alphabetical because it was spelled without a leading “|” (though that by itself could be achieved by adding the optional leading “|”).
This was referenced May 11, 2026
rust-borsBot
pushed a commit
that referenced
this pull request
May 11, 2026
…uwer Rollup of 11 pull requests Successful merges: - #156448 (miri subtree update) - #155023 (Introduce move expressions (`move($expr)`) ) - #156429 (Simplify `intrinsic::raw_eq` in MIR when possible) - #147672 (LLBC-linker: Do not strip debug symbols for the nvptx target anymore) - #155169 (jsondoclint: simplify code using idiomatic Rust) - #155184 ( Have arrays' `drop_glue` just unsize and call the slice version) - #156022 (rustdoc: Fix cosmetic issues when reporting unresolved paths in `broken_intra_doc_links`) - #156442 (Show intrinsics::gpu in docs) - #156461 (LLVM 23: Specify `returnaddress` intrinsic return type) - #156462 (LLVM 23: Accept float (instead of hex) literals in codegen tests) - #156466 (Refactor `CheckAttrVisitor` so rustfmt can format it.)
kpreid
commented
May 11, 2026
ContributorAuthor
@nnethercote On further investigation, the problem (or at least, a problem) is not the length of the or-pattern, but having a comment in the middle of an or-pattern. If I delete just the comments from the original use std::cmp::Ordering;pubfntest_case(attr:Ordering){match attr {Ordering::Less// blah blah blah
| Ordering::Equal | Ordering::Greater
=> {}}}Similar rustfmt issues: rust-lang/rustfmt#6491, rust-lang/rustfmt#4119 |
rust-timer added a commit
that referenced
this pull request
May 12, 2026
Rollup merge of #156466 - kpreid:checkattr, r=JonathanBrouwer Refactor `CheckAttrVisitor` so rustfmt can format it. I don’t have any need for this myself, but [I heard it was annoying people](https://rust-lang.zulipchat.com/#narrow/channel/147480-t-compiler.2Fdiagnostics/topic/.60.23.5Bdiagnostic.3A.3Aon_unimplemented.5D.60.20on.20trait.20methods.3F/near/594113991) and I like fixing formatting and structure problems. The key change is that the do-nothing cases are now individual match arms instead of an enormous or-pattern. In order to achieve this cleanly, I moved the code handling `Attribute::Parsed` into a separate function matching `AttributeKind`s rather than `Attribute`s. This also fixes `RustcAllowIncoherentImpl` being non-alphabetical because it was spelled without a leading “|” (though that by itself could be achieved by adding the optional leading “|”).
Uh oh!
There was an error while loading. Please reload this page.
WhySoBad pushed a commit
to WhySoBad/miri
that referenced
this pull request
May 13, 2026
…uwer Rollup of 11 pull requests Successful merges: - rust-lang/rust#156448 (miri subtree update) - rust-lang/rust#155023 (Introduce move expressions (`move($expr)`) ) - rust-lang/rust#156429 (Simplify `intrinsic::raw_eq` in MIR when possible) - rust-lang/rust#147672 (LLBC-linker: Do not strip debug symbols for the nvptx target anymore) - rust-lang/rust#155169 (jsondoclint: simplify code using idiomatic Rust) - rust-lang/rust#155184 ( Have arrays' `drop_glue` just unsize and call the slice version) - rust-lang/rust#156022 (rustdoc: Fix cosmetic issues when reporting unresolved paths in `broken_intra_doc_links`) - rust-lang/rust#156442 (Show intrinsics::gpu in docs) - rust-lang/rust#156461 (LLVM 23: Specify `returnaddress` intrinsic return type) - rust-lang/rust#156462 (LLVM 23: Accept float (instead of hex) literals in codegen tests) - rust-lang/rust#156466 (Refactor `CheckAttrVisitor` so rustfmt can format it.)
flip1995 pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Aug 17, 2026
…uwer Rollup of 11 pull requests Successful merges: - rust-lang/rust#156448 (miri subtree update) - rust-lang/rust#155023 (Introduce move expressions (`move($expr)`) ) - rust-lang/rust#156429 (Simplify `intrinsic::raw_eq` in MIR when possible) - rust-lang/rust#147672 (LLBC-linker: Do not strip debug symbols for the nvptx target anymore) - rust-lang/rust#155169 (jsondoclint: simplify code using idiomatic Rust) - rust-lang/rust#155184 ( Have arrays' `drop_glue` just unsize and call the slice version) - rust-lang/rust#156022 (rustdoc: Fix cosmetic issues when reporting unresolved paths in `broken_intra_doc_links`) - rust-lang/rust#156442 (Show intrinsics::gpu in docs) - rust-lang/rust#156461 (LLVM 23: Specify `returnaddress` intrinsic return type) - rust-lang/rust#156462 (LLVM 23: Accept float (instead of hex) literals in codegen tests) - rust-lang/rust#156466 (Refactor `CheckAttrVisitor` so rustfmt can format it.)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I don’t have any need for this myself, but I heard it was annoying people and I like fixing formatting and structure problems.
The key change is that the do-nothing cases are now individual match arms instead of an enormous or-pattern. In order to achieve this cleanly, I moved the code handling
Attribute::Parsedinto a separate function matchingAttributeKinds rather thanAttributes.This also fixes
RustcAllowIncoherentImplbeing non-alphabetical because it was spelled without a leading “|” (though that by itself could be achieved by adding the optional leading “|”).