Port #[macro_export] to the new attribute parsing infrastructure #143857

Periodic1911 · 2025-07-12T22:00:14Z

Ports macro_export to the new attribute parsing infrastructure for #131229 (comment)

r? @oli-obk

cc @JonathanBrouwer @jdonszelmann

rustbot · 2025-07-12T22:00:20Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann

Periodic1911 · 2025-07-12T22:07:44Z

tests/ui/attributes/invalid_macro_export_argument.rs

@@ -26,12 +22,15 @@ macro_rules! d {
 }

 #[macro_export()]
+//~^ ERROR malformed `macro_export` attribute input


This is a breaking change! Malformed macro_export attributes have had a lint since 2023 (deny(invalid_macro_export_arguments)). This PR makes this an error.
Furthermore, #[macro_export()] has been accepted since 2023, and this PR makes that an error too.

As discussed in #142838 (comment), we can make breaking changes as long as we do a crater run. So this PR needs a crater run.

bors · 2025-07-13T05:32:15Z

☔ The latest upstream changes (presumably #140717) made this pull request unmergeable. Please resolve the merge conflicts.

jdonszelmann · 2025-07-13T08:02:56Z

@Periodic1911 if you rebase I'll run a crater

jdonszelmann · 2025-07-13T08:03:54Z

@rust-lang/lang this makes a long-standing warning an error with a crater run. Just wanted to notify you

jdonszelmann · 2025-07-13T12:54:46Z

@bors try

Port #[macro_export] to the new attribute parsing infrastructure Ports macro_export to the new attribute parsing infrastructure for #131229 (comment) r? `@oli-obk` cc `@JonathanBrouwer` `@jdonszelmann`

bors · 2025-07-13T12:55:57Z

⌛ Trying commit ac1f122 with merge 723ab94...

bors · 2025-07-13T15:12:39Z

☀️ Try build successful - checks-actions
Build commit: 723ab94 (723ab942d877517caf445dafde0416803ef56501)

jdonszelmann · 2025-07-13T15:34:00Z

@craterbot check

Periodic1911 · 2025-08-01T14:30:59Z

@bors r=@jdonszelmann

bors · 2025-08-01T14:31:02Z

📌 Commit 90fad60 has been approved by jdonszelmann

It is now in the queue for this repository.

…zelmann Port #[macro_export] to the new attribute parsing infrastructure Ports macro_export to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? `@oli-obk` cc `@JonathanBrouwer` `@jdonszelmann`

Rollup of 14 pull requests Successful merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) - #143900 ([rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition) - #144070 (Implement `hash_map` macro ) - #144322 (Add lint against dangling pointers from local variables) - #144443 (Make target pointer width in target json an integer) - #144667 (`AlignmentEnum` should just be `repr(usize)` now) - #144779 (Implement debugging output of the bootstrap Step graph into a DOT file) - #144790 (Multiple bounds checking elision failures) - #144794 (Port `#[coroutine]` to the new attribute system) - #144808 (`Interner` arg to `EarlyBinder` does not affect auto traits) - #144816 (Update E0562 to account for the new impl trait positions) - #144822 (Return a struct with named fields from `hash_owner_nodes`) - #144824 (Updated test links in compiler) - #144829 (Use full flag name in strip command for Darwin) r? `@ghost` `@rustbot` modify labels: rollup

…zelmann Port #[macro_export] to the new attribute parsing infrastructure Ports macro_export to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? ``@oli-obk`` cc ``@JonathanBrouwer`` ``@jdonszelmann``

Rollup of 13 pull requests Successful merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) - #143900 ([rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition) - #144070 (Implement `hash_map` macro ) - #144322 (Add lint against dangling pointers from local variables) - #144443 (Make target pointer width in target json an integer) - #144667 (`AlignmentEnum` should just be `repr(usize)` now) - #144790 (Multiple bounds checking elision failures) - #144794 (Port `#[coroutine]` to the new attribute system) - #144808 (`Interner` arg to `EarlyBinder` does not affect auto traits) - #144816 (Update E0562 to account for the new impl trait positions) - #144822 (Return a struct with named fields from `hash_owner_nodes`) - #144824 (Updated test links in compiler) - #144829 (Use full flag name in strip command for Darwin) r? `@ghost` `@rustbot` modify labels: rollup

…zelmann Port #[macro_export] to the new attribute parsing infrastructure Ports macro_export to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? ```@oli-obk``` cc ```@JonathanBrouwer``` ```@jdonszelmann```

Rollup of 13 pull requests Successful merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) - #144070 (Implement `hash_map` macro ) - #144322 (Add lint against dangling pointers from local variables) - #144667 (`AlignmentEnum` should just be `repr(usize)` now) - #144678 (Make no_mangle on foreign items explicit instead of implicit) - #144790 (Multiple bounds checking elision failures) - #144794 (Port `#[coroutine]` to the new attribute system) - #144805 (compiletest: Preliminary cleanup of `ProcRes` printing/unwinding) - #144808 (`Interner` arg to `EarlyBinder` does not affect auto traits) - #144816 (Update E0562 to account for the new impl trait positions) - #144822 (Return a struct with named fields from `hash_owner_nodes`) - #144824 (Updated test links in compiler) - #144829 (Use full flag name in strip command for Darwin) r? `@ghost` `@rustbot` modify labels: rollup

Zalathar · 2025-08-03T10:25:52Z

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -360,6 +360,9 @@ pub enum AttributeKind {
    /// Represents `#[macro_escape]`.
    MacroEscape(Span),

+    /// Represents [`#[macro_export}`](https://doc.rust-lang.org/reference/macros-by-example.html#r-macro.decl.scope.path).


Nit: Typo here; } should be ].

…zelmann Port #[macro_export] to the new attribute parsing infrastructure Ports macro_export to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? `@oli-obk` cc `@JonathanBrouwer` `@jdonszelmann`

Rollup of 13 pull requests Successful merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) - #144070 (Implement `hash_map` macro ) - #144322 (Add lint against dangling pointers from local variables) - #144667 (`AlignmentEnum` should just be `repr(usize)` now) - #144706 (Do not give function allocations alignment in consteval and Miri.) - #144790 (Multiple bounds checking elision failures) - #144794 (Port `#[coroutine]` to the new attribute system) - #144805 (compiletest: Preliminary cleanup of `ProcRes` printing/unwinding) - #144808 (`Interner` arg to `EarlyBinder` does not affect auto traits) - #144816 (Update E0562 to account for the new impl trait positions) - #144822 (Return a struct with named fields from `hash_owner_nodes`) - #144824 (Updated test links in compiler) - #144829 (Use full flag name in strip command for Darwin) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-08-04T01:14:28Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout macro-export (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self macro-export --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/ui/attributes/malformed-attrs.stderr
CONFLICT (content): Merge conflict in tests/ui/attributes/malformed-attrs.stderr
Auto-merging tests/ui/attributes/malformed-attrs.rs
Auto-merging compiler/rustc_passes/src/check_attr.rs
Auto-merging compiler/rustc_lint_defs/src/builtin.rs
Auto-merging compiler/rustc_hir/src/attrs/encode_cross_crate.rs
Auto-merging compiler/rustc_hir/src/attrs/data_structures.rs
Auto-merging compiler/rustc_attr_parsing/src/context.rs
Automatic merge failed; fix conflicts and then commit the result.

jdonszelmann · 2025-08-04T08:37:03Z

@Periodic1911 feel free to r=me again whenever, after rebase

Periodic1911 · 2025-08-04T14:21:09Z

@bors r=@jdonszelmann

bors · 2025-08-04T14:21:13Z

📌 Commit 23e6be2 has been approved by jdonszelmann

It is now in the queue for this repository.

rustbot assigned oli-obk Jul 12, 2025

Periodic1911 commented Jul 12, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

Periodic1911 force-pushed the macro-export branch from 12474a6 to bb6c5dd Compare July 12, 2025 22:22

This comment has been minimized.

Sign in to view

jdonszelmann mentioned this pull request Jul 13, 2025

Tracking issue: Attribute refactor #131229

Open

9 tasks

jdonszelmann added T-lang Relevant to the language team I-lang-nominated Nominated for discussion during a lang team meeting. labels Jul 13, 2025

Periodic1911 force-pushed the macro-export branch from bb6c5dd to 92071cc Compare July 13, 2025 10:27

rustbot added the T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. label Jul 13, 2025

Periodic1911 force-pushed the macro-export branch from 92071cc to ac1f122 Compare July 13, 2025 10:33

This comment has been minimized.

Sign in to view

Periodic1911 force-pushed the macro-export branch from 7a67892 to 90fad60 Compare August 1, 2025 12:55

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 Aug 1, 2025

Zalathar mentioned this pull request Aug 3, 2025

Rollup of 14 pull requests #144844

Closed

Zalathar mentioned this pull request Aug 3, 2025

Rollup of 13 pull requests #144845

Closed

Zalathar mentioned this pull request Aug 3, 2025

Rollup of 13 pull requests #144846

Closed

Zalathar reviewed Aug 3, 2025

View reviewed changes

Zalathar mentioned this pull request Aug 3, 2025

Rollup of 13 pull requests #144850

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 Aug 4, 2025

Port #[macro_export] to the new attribute parsing infrastructure

23e6be2

Periodic1911 force-pushed the macro-export branch from 90fad60 to 23e6be2 Compare August 4, 2025 09:37

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label Aug 4, 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 4, 2025

Port #[macro_export] to the new attribute parsing infrastructure #143857

Are you sure you want to change the base?

Port #[macro_export] to the new attribute parsing infrastructure #143857

Conversation

Periodic1911 commented Jul 12, 2025

Uh oh!

rustbot commented Jul 12, 2025

Uh oh!

Periodic1911 Jul 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

bors commented Jul 13, 2025

Uh oh!

jdonszelmann commented Jul 13, 2025

Uh oh!

jdonszelmann commented Jul 13, 2025

Uh oh!

jdonszelmann commented Jul 13, 2025

Uh oh!

bors commented Jul 13, 2025

Uh oh!

bors commented Jul 13, 2025

Uh oh!

jdonszelmann commented Jul 13, 2025

Uh oh!

This comment has been minimized.

Periodic1911 commented Aug 1, 2025

Uh oh!

bors commented Aug 1, 2025

Uh oh!

Zalathar Aug 3, 2025

Choose a reason for hiding this comment

Uh oh!

bors commented Aug 4, 2025

Uh oh!

jdonszelmann commented Aug 4, 2025

Uh oh!

Periodic1911 commented Aug 4, 2025

Uh oh!

bors commented Aug 4, 2025

Uh oh!

Uh oh!

Periodic1911 Jul 12, 2025 •

edited

Loading