Open
Conversation
Collaborator
|
Some changes occurred in compiler/rustc_attr_parsing cc @jdonszelmann, @JonathanBrouwer Some changes occurred in compiler/rustc_passes/src/check_attr.rs cc @jdonszelmann, @JonathanBrouwer Some changes occurred in compiler/rustc_hir/src/attrs |
rustbot
added
A-attributes
Collaborator
|
|
This comment has been minimized.
This comment has been minimized.
chenyukang
force-pushed
the
yukang-fix-154801-cfg-attr-span
branch
from
ed6f9af to
952c5ba
Compare
Collaborator
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
|
|
||
| /// Represents the trace attribute of `#[cfg_attr]` | ||
| CfgAttrTrace, | ||
| CfgAttrTrace(Span), |
Contributor
There was a problem hiding this comment.
How does this behave with multiple cfg_attr attributes? Since this attribute can exist multiple times, ideally we should have a ThinVec<Span> here?
JonathanBrouwer
requested changes
Apr 4, 2026
rustbot
added
S-waiting-on-author
chenyukang
changed the title
chenyukang
force-pushed
the
yukang-fix-154801-cfg-attr-span
branch
from
952c5ba to
46e2396
Compare
This comment has been minimized.
This comment has been minimized.
chenyukang
force-pushed
the
yukang-fix-154801-cfg-attr-span
branch
from
46e2396 to
45b4e3c
Compare
Collaborator
|
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
approved these changes
Apr 25, 2026
Contributor
There was a problem hiding this comment.
@bors r+ rollup
While the is_prefix_attr_for_suggestions is far from correct, this solution is better than ICE'ing and it's only for diagnostics anyways, so doesn't need to be perfect
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 25, 2026
…ttr-span, r=JonathanBrouwer Fix ICE from cfg_attr_trace Fixes rust-lang#154801 Fixes rust-lang#143094 r? @JonathanBrouwer The root cause is we recovery from parsing attribute error here: https://github.com/rust-lang/rust/blob/ed6f9af7d47f5a5eda2a4a1925d1e250b51a37f2/compiler/rustc_attr_parsing/src/parser.rs#L550 while the later suggestion code from type checking try to inspect the attr span of the `expr` in the second error, keep the span seems reasonable.
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 25, 2026
…uwer Rollup of 6 pull requests Successful merges: - #154803 (Fix ICE from cfg_attr_trace ) - #155485 (Add an edge-case test for `--remap-path-prefix` for `rustc` & `rustdoc`) - #155659 (cleanup, restructure and merge `tests/ui/deriving` into `tests/ui/derives`) - #155696 (Add a higher-level API for parsing attributes) - #155734 (Lint doc comments in cfg_select branches) - #155769 (triagebot.toml: Ping Enselic when tests/debuginfo/basic-stepping.rs changes)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 25, 2026
…ttr-span, r=JonathanBrouwer Fix ICE from cfg_attr_trace Fixes rust-lang#154801 Fixes rust-lang#143094 r? @JonathanBrouwer The root cause is we recovery from parsing attribute error here: https://github.com/rust-lang/rust/blob/ed6f9af7d47f5a5eda2a4a1925d1e250b51a37f2/compiler/rustc_attr_parsing/src/parser.rs#L550 while the later suggestion code from type checking try to inspect the attr span of the `expr` in the second error, keep the span seems reasonable.
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 free
to 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.
Fixes #154801
Fixes #143094
r? @JonathanBrouwer
The root cause is we recovery from parsing attribute error here:
rust/compiler/rustc_attr_parsing/src/parser.rs
Line 550 in ed6f9af
while the later suggestion code from type checking try to inspect the attr span of the
exprin the second error, keep the span seems reasonable.