Don't suggest wrapping attr in unsafe if it may come from proc macro #149781

mu001999 · 2025-12-08T18:27:48Z

Don't emit the suggestion if the span may come from proc macro. Check this with the snippet because we cannot check if the span is from macro-rules or proc-macro (maybe this can happen in the future?).

Fixes #149756

rustbot · 2025-12-08T18:27:51Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

rustbot · 2025-12-08T18:27:54Z

r? @eholk

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

jdonszelmann · 2025-12-08T19:01:59Z

r? jdonszelmann

jdonszelmann · 2025-12-09T06:05:35Z

compiler/rustc_attr_parsing/src/safety.rs

                    Some(unsafe_since) => path_span.edition() >= unsafe_since,
                };

+                let may_from_proc_macro = if diag_span.from_expansion()


can_be_used_for_suggestions() might be more appropriate.

I tried this but it will deny suggestion for macro-rules macros, see test https://github.com/mu001999-contrib/rust/blob/7d1090ba9a06c297f7977b5d8e76681511f3e952/tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-fix.rs

I think such suggestions should still be emitted, how do you think about it?

compiler/rustc_attr_parsing/src/safety.rs

jdonszelmann

some smol nits, looks good otherwise!

View changes since this review

rustbot · 2025-12-09T06:07:43Z

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

bors · 2025-12-09T13:07:51Z

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

rustbot · 2025-12-09T14:55:42Z

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.

mu001999 · 2025-12-09T14:58:39Z

@rustbot ready

jdonszelmann · 2025-12-09T22:21:00Z

indeed, @bors r+ rollup

bors · 2025-12-09T22:21:02Z

📌 Commit 50e9839 has been approved by jdonszelmann

It is now in the queue for this repository.

…nszelmann Don't suggest wrapping attr in unsafe if it may come from proc macro Don't emit the suggestion if the span may come from proc macro. Check this with the snippet because we cannot check if the span is from macro-rules or proc-macro (maybe this can happen in the future?). Fixes rust-lang#149756

Rollup of 12 pull requests Successful merges: - #147602 (Deduplicate higher-ranked lifetime capture errors in impl Trait) - #147725 (Remove -Zoom=panic) - #148294 (callconv: fix mips64 aggregate argument passing for C FFI) - #148491 ( Correctly provide suggestions when encountering `async fn` with a `dyn Trait` return type) - #149417 (tidy: Detect outdated workspaces in workspace list) - #149458 (Run clippy on cg_gcc in CI) - #149679 (Restrict spe_acc to PowerPC SPE targets) - #149781 (Don't suggest wrapping attr in unsafe if it may come from proc macro) - #149795 (Use `let`...`else` instead of `match foo { ... _ => return };` and `if let ... else return` in std) - #149816 (Make typo in field and name suggestions verbose) - #149824 (Add a regression test for issue 145748) - #149826 (compiletest: tidy up `adb_path`/`adb_test_dir` handling) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 10 pull requests Successful merges: - #147725 (Remove -Zoom=panic) - #148294 (callconv: fix mips64 aggregate argument passing for C FFI) - #148491 ( Correctly provide suggestions when encountering `async fn` with a `dyn Trait` return type) - #149458 (Run clippy on cg_gcc in CI) - #149679 (Restrict spe_acc to PowerPC SPE targets) - #149781 (Don't suggest wrapping attr in unsafe if it may come from proc macro) - #149795 (Use `let`...`else` instead of `match foo { ... _ => return };` and `if let ... else return` in std) - #149816 (Make typo in field and name suggestions verbose) - #149824 (Add a regression test for issue 145748) - #149826 (compiletest: tidy up `adb_path`/`adb_test_dir` handling) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #149781 - mu001999-contrib:fix/149756, r=jdonszelmann Don't suggest wrapping attr in unsafe if it may come from proc macro Don't emit the suggestion if the span may come from proc macro. Check this with the snippet because we cannot check if the span is from macro-rules or proc-macro (maybe this can happen in the future?). Fixes #149756

nnethercote · 2025-12-10T20:36:45Z

Thanks for doing this, @mu001999!

A suggestion for next time: for PRs that improve error messages I like to do it in two steps:

A first commit that adds a test showing the sub-optimal error message.
A second commit with the code changes and the expected output changes.

This makes reviewing easier, because it's really clear how the error message changed.

Rollup of 10 pull requests Successful merges: - rust-lang/rust#147725 (Remove -Zoom=panic) - rust-lang/rust#148294 (callconv: fix mips64 aggregate argument passing for C FFI) - rust-lang/rust#148491 ( Correctly provide suggestions when encountering `async fn` with a `dyn Trait` return type) - rust-lang/rust#149458 (Run clippy on cg_gcc in CI) - rust-lang/rust#149679 (Restrict spe_acc to PowerPC SPE targets) - rust-lang/rust#149781 (Don't suggest wrapping attr in unsafe if it may come from proc macro) - rust-lang/rust#149795 (Use `let`...`else` instead of `match foo { ... _ => return };` and `if let ... else return` in std) - rust-lang/rust#149816 (Make typo in field and name suggestions verbose) - rust-lang/rust#149824 (Add a regression test for issue 145748) - rust-lang/rust#149826 (compiletest: tidy up `adb_path`/`adb_test_dir` handling) 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 Dec 8, 2025

rustbot assigned eholk Dec 8, 2025

rustbot assigned jdonszelmann and unassigned eholk Dec 8, 2025

jdonszelmann mentioned this pull request Dec 9, 2025

Remove uses of cfg({any()/all()}) #149791

Open

jdonszelmann reviewed Dec 9, 2025

View reviewed changes

compiler/rustc_attr_parsing/src/safety.rs Outdated Show resolved Hide resolved

jdonszelmann requested changes Dec 9, 2025

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 Dec 9, 2025

Don't suggest wrapping attr in unsafe if it may come from proc macro

50e9839

mu001999 force-pushed the fix/149756 branch from 7d1090b to 50e9839 Compare December 9, 2025 14:55

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 Dec 9, 2025

mu001999 requested a review from jdonszelmann December 9, 2025 14:58

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 Dec 9, 2025

Zalathar mentioned this pull request Dec 10, 2025

Rollup of 13 pull requests #149828

Closed

Zalathar mentioned this pull request Dec 10, 2025

Rollup of 12 pull requests #149830

Closed

matthiaskrgr mentioned this pull request Dec 10, 2025

Rollup of 10 pull requests #149836

Merged

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

rustbot added this to the 1.94.0 milestone Dec 10, 2025

Uh oh!

Don't suggest wrapping attr in unsafe if it may come from proc macro #149781

Don't suggest wrapping attr in unsafe if it may come from proc macro #149781

Uh oh!

Conversation

mu001999 commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Dec 8, 2025

Uh oh!

rustbot commented Dec 8, 2025

Uh oh!

jdonszelmann commented Dec 8, 2025

Uh oh!

jdonszelmann Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

mu001999 Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

mu001999 Dec 9, 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!

Uh oh!

jdonszelmann 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!

rustbot commented Dec 9, 2025

Uh oh!

bors commented Dec 9, 2025

Uh oh!

rustbot commented Dec 9, 2025

Uh oh!

mu001999 commented Dec 9, 2025

Uh oh!

jdonszelmann commented Dec 9, 2025

Uh oh!

bors commented Dec 9, 2025

Uh oh!

Uh oh!

nnethercote commented Dec 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mu001999 commented Dec 8, 2025 •

edited

Loading

mu001999 Dec 9, 2025 •

edited

Loading

jdonszelmann left a comment •

edited by rustbot

Loading