Handle macro invocation in attribute during parse #146579

estebank · 2025-09-15T09:29:59Z

error: expected a literal (`1u8`, `1.0f32`, `"string"`, etc.) here, found macro `concat`
  --> $DIR/macro-in-attribute.rs:4:21
   |
LL | #[deprecated(note = concat!("a", "b"))]
   |                     ^^^^^^^^^^^^^^^^^ macros are not allowed here

Fix #146325.

rustbot · 2025-09-15T09:30:02Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

rustbot · 2025-09-15T09:30:04Z

r? @davidtwco

rustbot has assigned @davidtwco.
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

mu001999 · 2025-09-15T09:44:22Z

compiler/rustc_attr_parsing/src/parser.rs

-            let before = self.parser.token.span.shrink_to_lo();
-            while let token::Ident(..) = self.parser.token.kind {
-                self.parser.bump();
+            if self.parser.look_ahead(1, |t| matches!(t.kind, token::TokenKind::Bang)) {


What if we meet:

#[deprecated(note = a!=b)] struct X;

Silly me, I organized things thinking of only parsing a macro and not a statement. I think that parse_stmt_without_recovery will fail because of a lack of ;, but I can look at the stmt.kind instead. It should give the error with no note or structured suggestion.

I'll wait with further review for this

generally looking good though :)

jdonszelmann · 2025-09-15T16:10:09Z

r? jdonszelmann

jdonszelmann · 2025-09-16T06:51:16Z

r? author

tests/ui/parser/attribute/attr-bad-meta-4.stderr

compiler/rustc_ast/src/ast.rs

tests/ui/parser/attribute/attr-bad-meta-4.stderr

jdonszelmann · 2025-09-29T12:45:54Z

@rustbot author

rustbot · 2025-09-29T12:45:59Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

``` error: expected a literal (`1u8`, `1.0f32`, `"string"`, etc.) here, found macro `concat` --> $DIR/macro-in-attribute.rs:4:21 | LL | #[deprecated(note = concat!("a", "b"))] | ^^^^^^^^^^^^^^^^^ macros are not allowed here ```

rustbot · 2025-11-03T19:21:40Z

This PR was rebased onto a different master 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.

estebank · 2025-11-03T19:25:37Z

@rustbot ready

jdonszelmann · 2025-11-10T09:35:01Z

@bors r+ rollup thanks @estebank :3

bors · 2025-11-10T09:35:04Z

📌 Commit 9ca8198 has been approved by jdonszelmann

It is now in the queue for this repository.

bors · 2025-11-10T09:35:05Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Handle macro invocation in attribute during parse ``` error: expected a literal (`1u8`, `1.0f32`, `"string"`, etc.) here, found macro `concat` --> $DIR/macro-in-attribute.rs:4:21 | LL | #[deprecated(note = concat!("a", "b"))] | ^^^^^^^^^^^^^^^^^ macros are not allowed here ``` Fix rust-lang#146325.

JonathanBrouwer · 2025-11-10T20:15:21Z

@bors r-

Conflict with #148712
Please rebase on that after it merges

#148800 (comment)

JonathanBrouwer · 2025-11-11T17:43:39Z

The conflicting PR merged, @estebank could you rebase?

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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 Sep 15, 2025

rustbot assigned davidtwco Sep 15, 2025

mu001999 reviewed Sep 15, 2025

View reviewed changes

rustbot assigned jdonszelmann and unassigned davidtwco Sep 15, 2025

This comment was marked as resolved.

Sign in to view

jdonszelmann 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 16, 2025

estebank force-pushed the issue-146325 branch from f48a21e to 811d2e7 Compare September 28, 2025 20:53

This comment has been minimized.

Sign in to view

estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 28, 2025

mu001999 reviewed Sep 29, 2025

View reviewed changes

tests/ui/parser/attribute/attr-bad-meta-4.stderr Show resolved Hide resolved

compiler/rustc_ast/src/ast.rs Outdated Show resolved Hide resolved

jdonszelmann reviewed Sep 29, 2025

View reviewed changes

tests/ui/parser/attribute/attr-bad-meta-4.stderr Show resolved Hide resolved

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 29, 2025

This comment was marked as outdated.

Sign in to view

estebank and others added 3 commits November 3, 2025 19:10

Handle macro invocation in attribute during parse

f183966

``` error: expected a literal (`1u8`, `1.0f32`, `"string"`, etc.) here, found macro `concat` --> $DIR/macro-in-attribute.rs:4:21 | LL | #[deprecated(note = concat!("a", "b"))] | ^^^^^^^^^^^^^^^^^ macros are not allowed here ```

Rework attribute recovery logic

d7b9a26

review comment

9ca8198

estebank force-pushed the issue-146325 branch from 811d2e7 to 9ca8198 Compare November 3, 2025 19:21

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 3, 2025

mu001999 approved these changes Nov 4, 2025

View reviewed changes

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 Nov 10, 2025

ChrisDenton mentioned this pull request Nov 10, 2025

Rollup of 14 pull requests #148800

Closed

bors 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 Nov 10, 2025

Handle macro invocation in attribute during parse #146579

Are you sure you want to change the base?

Handle macro invocation in attribute during parse #146579

Uh oh!

Conversation

estebank commented Sep 15, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 15, 2025

Uh oh!

rustbot commented Sep 15, 2025

Uh oh!

mu001999 Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

estebank Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

jdonszelmann Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

jdonszelmann Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

estebank Sep 28, 2025

Choose a reason for hiding this comment

Uh oh!

jdonszelmann commented Sep 15, 2025

Uh oh!

jdonszelmann commented Sep 16, 2025

Uh oh!

This comment was marked as resolved.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

jdonszelmann commented Sep 29, 2025

Uh oh!

rustbot commented Sep 29, 2025

Uh oh!

This comment was marked as outdated.

rustbot commented Nov 3, 2025

Uh oh!

estebank commented Nov 3, 2025

Uh oh!

jdonszelmann commented Nov 10, 2025

Uh oh!

bors commented Nov 10, 2025

Uh oh!

bors commented Nov 10, 2025

Uh oh!

JonathanBrouwer commented Nov 10, 2025

Uh oh!

JonathanBrouwer commented Nov 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

estebank commented Sep 15, 2025 •

edited by rustbot

Loading