More cleanup in `rustc_attr_parsing` by qaijuang · Pull Request #159875 · rust-lang/rust

qaijuang · 2026-07-24T23:46:46Z

Follow up to #159508.

r? @mejrs

rustbot · 2026-07-24T23:46:49Z

Some changes occurred to diagnostic attributes.

cc @mejrs

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

mejrs · 2026-07-25T16:35:21Z

-                            cx.emit_err(e);
-                        }
-                    }
+            (Mode::RustcOnUnimplemented, sym::on) if is_root => {


Can you undo the changes in this arm? The reason it doesn't fallthrough is because as part of future work this will need to emit a different error/lint:

(Mode::RustcOnUnimplemented, sym::on)=> { if is root { ... } else { // error about how nested filters are not supported } }

and I don't feel like having to revert this when I/someone gets to it.

(and, ideally, this will be supported for more modes, so I don't want to duplicate the pattern either...)

View changes since the review

mejrs · 2026-07-25T16:46:49Z

+                if let Some(sym::local_inner_macros) =
+                    l.meta_item_no_args().and_then(|i| i.path().word_sym())
+                {
+                    true
+                } else {
+                    cx.adcx().warn_ill_formed_attribute_input(INVALID_MACRO_EXPORT_ARGUMENTS);
+                    return None;


this can be further simplified with word_is I believe

View changes since the review

Simplified as in?

if l.meta_item_no_args().is_some_and(|m| m.path().word_is(sym::local_inner_macros)) { true } else { cx.adcx().warn_ill_formed_attribute_input(INVALID_MACRO_EXPORT_ARGUMENTS); return None; }

mejrs · 2026-07-25T16:55:00Z

                    if let Ok(val) = u32::try_from(val.get()) {
                        return Some(AttributeKind::Unroll(UnrollAttr::Count(val)));
-                    } else {
-                        cx.adcx().expected_integer_literal_in_range(l.span(), 0, u32::MAX as isize);
-                        return None;
                    }
+                    cx.adcx().expected_integer_literal_in_range(l.span(), 0, u32::MAX as isize);
+                    return None;
                }


This seems a little too trivial, can you revert?

remember that there's a cost to making these changes (me reviewing, future people trying to figure out the history of this code etc), so please only do "cleanup" if it's genuinely an improvement.

View changes since the review

Thanks!

This somehow slipped pass my diff check reluctantly, but at least i got my self familiar with rustc_attr_parsing components and things are a bit clearer to me than before(most esp! the Don'ts)

@rustbot ready

rustbot · 2026-07-25T16:55:22Z

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

mejrs · 2026-07-25T21:40:42Z

Thanks, next time please give your commit messages a more meaningful description though (if you have multiple; I probably wouldn't in this case) 🙂

@bors squash "Various cleanups around rustc_attr_parsing"

rust-bors · 2026-07-25T21:40:44Z

Unknown argument ""Various". Did you mean to use @bors squash [msg|message="<commit-msg>"|description]? Run @bors help or go to https://bors.rust-lang.org/help to see available commands.

mejrs · 2026-07-25T21:41:22Z

@bors squash message="Various cleanups around rustc_attr_parsing"

rust-bors · 2026-07-25T21:41:49Z

🔨 13 commits were squashed into 2360529.

mejrs

@bors r+ rollup

View changes since this review

rust-bors · 2026-07-25T21:42:12Z

📌 Commit 2360529 has been approved by mejrs

It is now in the queue for this repository.

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

Reason for tree closure: spurious failures

@mejrs

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

@mejrs

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

@mejrs

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

…uwer Rollup of 24 pull requests Successful merges: - #159638 (bootstrap: Split the `Step` trait into multiple traits) - #159774 (rustc_trait_selection: fix trait solver hang caused by degenerate obligations) - #159837 (line-tables-only test: check that the line number matches the function name) - #159946 (Update Enzyme submodule to imporve llvm-cov) - #159617 (Fix up `#[linkage]` target checking) - #159733 (std: Switch implementations of `thread_local!` for WASI) - #159783 (Check unsafe impls on safe EIIs) - #159810 (Add tuple never coercion collection regression test) - #159821 (Update expect message using the recommended style in binary_heap module) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159846 (Implement `str::copy_from_str`) - #159849 (rustc_parse: Stop returning `Option` from statement parsing) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159875 (More cleanup in `rustc_attr_parsing`) - #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - #159891 (Split multiline derives into std/rustc macros) - #159893 (Fix `find_attr` hygiene and `rustc_hir` cleanups) - #159895 (rustc-dev-guide subtree update) - #159902 (Clarify that the expected runtime symbols signature is for the current target only) - #159914 (Fix error in diagnostic on_unmatched_args) - #159917 (spare capacity mut constification) - #159918 (rename abort_unwind → abort_on_unwind) - #159936 (Minor `rustc_ast::ast` doc cleanups) - #159945 (Update expect messages in library/core/src/ptr/non_null.rs)

@mejrs

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

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 24, 2026

rustbot assigned mejrs Jul 24, 2026

mejrs requested changes Jul 25, 2026

View reviewed changes

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 Jul 25, 2026

qaijuang force-pushed the 159508-follow-up branch from 0859e62 to b3bcb5b Compare July 25, 2026 19:04

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 Jul 25, 2026

This comment has been minimized.

Sign in to view

Various cleanups around rustc_attr_parsing

2360529

rust-bors Bot force-pushed the 159508-follow-up branch from b3bcb5b to 2360529 Compare July 25, 2026 21:41

mejrs approved these changes Jul 25, 2026

View reviewed changes

rust-bors Bot 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 Jul 25, 2026

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 25, 2026

Rollup merge of rust-lang#159875 - qaijuang:159508-follow-up, r=mejrs

5076e83

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

JonathanBrouwer mentioned this pull request Jul 25, 2026

Rollup of 14 pull requests #159931

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 26, 2026

Rollup merge of rust-lang#159875 - qaijuang:159508-follow-up, r=mejrs

9918b8d

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

JonathanBrouwer mentioned this pull request Jul 26, 2026

Rollup of 25 pull requests #159952

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 26, 2026

Rollup merge of rust-lang#159875 - qaijuang:159508-follow-up, r=mejrs

be74601

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

JonathanBrouwer mentioned this pull request Jul 26, 2026

Rollup of 24 pull requests #159957

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 26, 2026

Rollup merge of rust-lang#159875 - qaijuang:159508-follow-up, r=mejrs

7b8dc81

More cleanup in `rustc_attr_parsing` Follow up to rust-lang#159508. r? @mejrs

JonathanBrouwer mentioned this pull request Jul 26, 2026

Rollup of 28 pull requests #159966

Open

Uh oh!

Uh oh!

Conversation

qaijuang commented Jul 24, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 24, 2026

Uh oh!

mejrs Jul 25, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mejrs Jul 25, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qaijuang Jul 25, 2026 • 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!

mejrs Jul 25, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qaijuang Jul 25, 2026 • 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!

rustbot commented Jul 25, 2026

Uh oh!

mejrs commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

mejrs commented Jul 25, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jul 25, 2026

Uh oh!

mejrs left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

qaijuang commented Jul 24, 2026 •

edited by rustbot

Loading

mejrs Jul 25, 2026 •

edited by rustbot

Loading

mejrs Jul 25, 2026 •

edited by rustbot

Loading

qaijuang Jul 25, 2026 •

edited

Loading

mejrs Jul 25, 2026 •

edited by rustbot

Loading

qaijuang Jul 25, 2026 •

edited

Loading

mejrs left a comment •

edited by rustbot

Loading