Port `#[should_panic]` to the new attribute parsing infrastructure #143808

JonathanBrouwer · 2025-07-11T16:38:42Z

Ports #[should_panic] to the new attribute parsing infrastructure for #131229 (comment)

rustbot · 2025-07-11T16:38:47Z

jdonszelmann is currently at their maximum review capacity.
They may take a while to respond.

rustbot · 2025-07-11T16:38:50Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

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

cc @jdonszelmann

compiler/rustc_passes/src/check_attr.rs

JonathanBrouwer · 2025-07-11T16:41:48Z

tests/ui/test-attrs/test-should-panic-attr.rs

@@ -1,4 +1,3 @@
-//@ check-pass


This is a breaking change! Malformed should_panic attributes have had the following warning since 2016:

warning: argument must be of the form: `expected = "error message"` --> src/main.rs:5:1 | 5 | #[should_panic(expected = "foo", bar)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: errors in this attribute were erroneously allowed and will become a hard error in a future release

This PR makes this an error.

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.

JonathanBrouwer

This issue is currently NOT solved by this PR.
We can do this in a future PR or now, but we should decide whether this should be a warning or error:
#143799

bors · 2025-07-12T14:58:41Z

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

JonathanBrouwer · 2025-07-13T13:11:59Z

^ Rebased on #143796
@rustbot ready

I'd propose to do #143799 in a separate PR, as I think it's more likely to fail crater than the change in this PR

bors · 2025-07-14T08:42:43Z

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

bors · 2025-07-17T08:42:38Z

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

jdonszelmann · 2025-07-17T09:46:49Z

@bors try

bors · 2025-07-17T09:47:59Z

🔒 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 should_panic_parser (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 should_panic_parser --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 compiler/rustc_passes/src/check_attr.rs
Auto-merging compiler/rustc_parse/src/validate_attr.rs
Auto-merging compiler/rustc_hir/src/hir.rs
Auto-merging compiler/rustc_builtin_macros/src/test.rs
CONFLICT (content): Merge conflict in compiler/rustc_builtin_macros/src/test.rs
Auto-merging compiler/rustc_attr_parsing/src/context.rs
Auto-merging compiler/rustc_attr_data_structures/src/encode_cross_crate.rs
Auto-merging compiler/rustc_attr_data_structures/src/attributes.rs
Automatic merge failed; fix conflicts and then commit the result.

jdonszelmann · 2025-07-17T10:16:12Z

@bors try

Port `#[should_panic]` to the new attribute parsing infrastructure Ports `#[should_panic]` to the new attribute parsing infrastructure for #131229 (comment) r? `@jdonszelmann`

bors · 2025-07-17T10:17:23Z

⌛ Trying commit 877a65d with merge 5de9e0e...

bors · 2025-07-17T12:35:20Z

☀️ Try build successful - checks-actions
Build commit: 5de9e0e (5de9e0e6cf775e94e0de2003f35e183f3f77bfe8)

rfcbot · 2025-08-06T19:14:15Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

Signed-off-by: Jonathan Brouwer <[email protected]>

rustbot · 2025-08-06T19:38:29Z

Some changes occurred in compiler/rustc_hir/src/attrs

cc @jdonszelmann

JonathanBrouwer · 2025-08-06T19:38:37Z

@jdonszelmann Rebased ^

jdonszelmann · 2025-08-06T19:44:23Z

@bors r+

bors · 2025-08-06T19:44:26Z

📌 Commit 4281e05 has been approved by jdonszelmann

It is now in the queue for this repository.

ehuss · 2025-08-07T01:43:11Z

Does this mean this note should be removed?

…r, r=jdonszelmann Port `#[should_panic]` to the new attribute parsing infrastructure Ports `#[should_panic]` to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? `@jdonszelmann`

…r, r=jdonszelmann Port `#[should_panic]` to the new attribute parsing infrastructure Ports `#[should_panic]` to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? ``@jdonszelmann``

traviscross · 2025-08-07T03:23:29Z

Does this mean this note should be removed?

Yes.

Remove note on accepted invalid should_panic syntax reference#1955

…r, r=jdonszelmann Port `#[should_panic]` to the new attribute parsing infrastructure Ports `#[should_panic]` to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? `@jdonszelmann`

…r, r=jdonszelmann Port `#[should_panic]` to the new attribute parsing infrastructure Ports `#[should_panic]` to the new attribute parsing infrastructure for rust-lang#131229 (comment) r? ``@jdonszelmann``

Rollup of 20 pull requests Successful merges: - #137831 (Tweak auto trait errors) - #143028 (emit `StorageLive` and schedule `StorageDead` for `let`-`else`'s bindings after matching) - #143764 (lower pattern bindings in the order they're written and base drop order on primary bindings' order) - #143808 (Port `#[should_panic]` to the new attribute parsing infrastructure ) - #143906 (Miri: non-deterministic floating point operations in `foreign_items`) - #143929 (Mark all deprecation lints in name resolution as deny-by-default and report-in-deps) - #144133 (Stabilize const TypeId::of) - #144439 (Introduce ModernIdent type to unify macro 2.0 hygiene handling) - #144473 (Address libunwind.a inconsistency issues in the bootstrap program) - #144659 (bootstrap: refactor mingw dist and fix gnullvm) - #144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled) - #144807 (Streamline config in bootstrap) - #144900 (Stabilize `unsigned_signed_diff` feature) - #144903 (Rename `begin_panic_handler` to `panic_handler`) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - #144974 (compiler-builtins subtree update) - #144997 (bump bootstrap compiler to 1.90 beta) - #145004 (Couple of minor cleanups) - #145009 (A couple small changes for rust-analyzer next-solver work) - #145014 (Revert "Preserve the .debug_gdb_scripts section") r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 19 pull requests Successful merges: - #137831 (Tweak auto trait errors) - #138689 (add nvptx_target_feature) - #140267 (implement continue_ok and break_ok for ControlFlow) - #143028 (emit `StorageLive` and schedule `StorageDead` for `let`-`else`'s bindings after matching) - #143764 (lower pattern bindings in the order they're written and base drop order on primary bindings' order) - #143808 (Port `#[should_panic]` to the new attribute parsing infrastructure ) - #143906 (Miri: non-deterministic floating point operations in `foreign_items`) - #143929 (Mark all deprecation lints in name resolution as deny-by-default and report-in-deps) - #144133 (Stabilize const TypeId::of) - #144369 (Upgrade semicolon_in_expressions_from_macros from warn to deny) - #144439 (Introduce ModernIdent type to unify macro 2.0 hygiene handling) - #144473 (Address libunwind.a inconsistency issues in the bootstrap program) - #144601 (Allow `cargo fix` to partially apply `mismatched_lifetime_syntaxes`) - #144650 (Additional tce tests) - #144659 (bootstrap: refactor mingw dist and fix gnullvm) - #144682 (Stabilize `strict_overflow_ops`) - #145026 (Update books) - #145033 (Reimplement `print_region` in `type_name.rs`.) - #145040 (rustc-dev-guide subtree update) Failed merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143808 - JonathanBrouwer:should_panic_parser, r=jdonszelmann Port `#[should_panic]` to the new attribute parsing infrastructure Ports `#[should_panic]` to the new attribute parsing infrastructure for #131229 (comment) r? ```@jdonszelmann```

rustbot assigned jdonszelmann Jul 11, 2025

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 Jul 11, 2025

JonathanBrouwer commented Jul 11, 2025

View reviewed changes

compiler/rustc_passes/src/check_attr.rs Outdated Show resolved Hide resolved

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2025

JonathanBrouwer commented Jul 11, 2025

View reviewed changes

JonathanBrouwer force-pushed the should_panic_parser branch from 9014cc9 to dd9d982 Compare July 12, 2025 15:53

This was referenced Jul 12, 2025

Tracking issue: Attribute refactor #131229

Open

Should_panic can be applied to non-tests #143799

Open

JonathanBrouwer force-pushed the should_panic_parser branch from dd9d982 to 41f9368 Compare July 13, 2025 13:10

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jul 13, 2025

JonathanBrouwer force-pushed the should_panic_parser branch 2 times, most recently from bee8d3d to 4b68dc9 Compare July 15, 2025 11:59

JonathanBrouwer force-pushed the should_panic_parser branch from 4b68dc9 to 877a65d Compare July 17, 2025 10:07

traviscross added the I-lang-radar Items that are on lang's radar and will need eventual work or consideration. label Aug 2, 2025

rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Aug 6, 2025

rfcbot added the to-announce Announce this issue on triage meeting label Aug 6, 2025

rustbot mentioned this pull request Aug 6, 2025

Tracking issue for release notes of #143808: Port #[should_panic] to the new attribute parsing infrastructure #145016

Open

JonathanBrouwer added 2 commits August 6, 2025 21:37

Port #[should_panic] to the new attribute parsing infrastructure

f7ad406

Signed-off-by: Jonathan Brouwer <[email protected]>

Changes to the tests for the #[should_panic] port

4281e05

Signed-off-by: Jonathan Brouwer <[email protected]>

JonathanBrouwer force-pushed the should_panic_parser branch from 877a65d to 4281e05 Compare August 6, 2025 19:38

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

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 21 pull requests #145034

Closed

traviscross mentioned this pull request Aug 7, 2025

Remove note on accepted invalid should_panic syntax rust-lang/reference#1955

Open

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 20 pull requests #145039

Closed

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 19 pull requests #145043

Merged

bors merged commit 995ca3e into rust-lang:master Aug 7, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 7, 2025

Port #[should_panic] to the new attribute parsing infrastructure #143808

Port #[should_panic] to the new attribute parsing infrastructure #143808

Conversation

JonathanBrouwer commented Jul 11, 2025

Uh oh!

rustbot commented Jul 11, 2025

Uh oh!

rustbot commented Jul 11, 2025

Uh oh!

Uh oh!

JonathanBrouwer Jul 11, 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!

JonathanBrouwer left a comment

Choose a reason for hiding this comment

Uh oh!

bors commented Jul 12, 2025

Uh oh!

JonathanBrouwer commented Jul 13, 2025

Uh oh!

bors commented Jul 14, 2025

Uh oh!

bors commented Jul 17, 2025

Uh oh!

jdonszelmann commented Jul 17, 2025

Uh oh!

bors commented Jul 17, 2025

Uh oh!

jdonszelmann commented Jul 17, 2025

Uh oh!

bors commented Jul 17, 2025

Uh oh!

bors commented Jul 17, 2025

Uh oh!

rfcbot commented Aug 6, 2025

Uh oh!

rustbot commented Aug 6, 2025

Uh oh!

JonathanBrouwer commented Aug 6, 2025

Uh oh!

jdonszelmann commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

ehuss commented Aug 7, 2025

Uh oh!

traviscross commented Aug 7, 2025

Uh oh!

Uh oh!

Uh oh!

Port `#[should_panic]` to the new attribute parsing infrastructure #143808

Port `#[should_panic]` to the new attribute parsing infrastructure #143808

JonathanBrouwer Jul 11, 2025 •

edited

Loading