Handle macro invocation in attribute during parse by estebank · Pull Request #146579 · rust-lang/rust

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.

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

@rustbot ready

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?

``` 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-12-09T01:21:14Z

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 · 2025-12-09T08:32:22Z

@bors r=jdonszelmann rollup

bors · 2025-12-09T08:32:26Z

📌 Commit 761cb57 has been approved by jdonszelmann

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - #144938 (Enable `outline-atomics` by default on more AArch64 platforms) - #146579 (Handle macro invocation in attribute during parse) - #149400 (unstable proc_macro tracked::* rename/restructure) - #149664 (attempt to fix unreachable code regression ) - #149806 (Mirror `ubuntu:24.04` on ghcr) Failed merges: - #149789 (Cleanup in the attribute parsers) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146579 - estebank:issue-146325, r=jdonszelmann 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 #146325.

Rollup of 5 pull requests Successful merges: - rust-lang/rust#144938 (Enable `outline-atomics` by default on more AArch64 platforms) - rust-lang/rust#146579 (Handle macro invocation in attribute during parse) - rust-lang/rust#149400 (unstable proc_macro tracked::* rename/restructure) - rust-lang/rust#149664 (attempt to fix unreachable code regression ) - rust-lang/rust#149806 (Mirror `ubuntu:24.04` on ghcr) Failed merges: - rust-lang/rust#149789 (Cleanup in the attribute parsers) r? `@ghost` `@rustbot` modify labels: rollup

Kobzol · 2025-12-16T08:25:33Z

@rust-timer build baf3ab6

Trying if this regressed perf. in #149818 (although quite unlikely).

rust-timer · 2025-12-16T09:46:49Z

Finished benchmarking commit (baf3ab6): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.5%	[-1.0%, -0.3%]	3
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 3.2%, secondary -3.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	3.2%	[3.2%, 3.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-3.2%, -3.2%]	1
All ❌✅ (primary)	3.2%	[3.2%, 3.2%]	1

Cycles

Results (primary 2.1%, secondary -2.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 471.772s -> 471.951s (0.04%)
Artifact size: 389.00 MiB -> 389.01 MiB (0.00%)

Rollup of 5 pull requests Successful merges: - rust-lang/rust#144938 (Enable `outline-atomics` by default on more AArch64 platforms) - rust-lang/rust#146579 (Handle macro invocation in attribute during parse) - rust-lang/rust#149400 (unstable proc_macro tracked::* rename/restructure) - rust-lang/rust#149664 (attempt to fix unreachable code regression ) - rust-lang/rust#149806 (Mirror `ubuntu:24.04` on ghcr) Failed merges: - rust-lang/rust#149789 (Cleanup in the attribute parsers) r? `@ghost` `@rustbot` modify labels: rollup

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 force-pushed the issue-146325 branch from 811d2e7 to 9ca8198 Compare November 3, 2025 19:21

This comment has been minimized.

Sign in to view

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

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

estebank and others added 4 commits December 9, 2025 01:16

Handle macro invocation in attribute during parse

01e2cf8

``` 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

0b0e826

review comment

c1500f9

fix test

761cb57

estebank force-pushed the issue-146325 branch from 9ca8198 to 761cb57 Compare December 9, 2025 01:21

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 9, 2025

matthiaskrgr mentioned this pull request Dec 9, 2025

Rollup of 5 pull requests #149818

Merged

bors merged commit 90dc2b6 into rust-lang:main Dec 10, 2025
11 checks passed

rustbot added this to the 1.94.0 milestone Dec 10, 2025

This comment has been minimized.

Sign in to view

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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.

This comment has been minimized.

estebank commented Nov 3, 2025

Uh oh!

JonathanBrouwer commented Nov 10, 2025

Uh oh!

JonathanBrouwer commented Nov 11, 2025

Uh oh!

rustbot commented Dec 9, 2025

Uh oh!

JonathanBrouwer commented Dec 9, 2025

Uh oh!

bors commented Dec 9, 2025

Uh oh!

Uh oh!

Kobzol commented Dec 16, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Dec 16, 2025

Overall result: ✅ improvements - no action needed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

estebank commented Sep 15, 2025 •

edited by rustbot

Loading