Rewrite `inline` attribute parser to use new infrastructure and improve diagnostics for all parsed attributes #138165

jdonszelmann · 2025-03-07T16:07:27Z

This PR:

creates a new parser for inline attributes
creates consistent error messages and error codes between attribute parsers; inline and others
as such changes a few error messages for other attributes to be (in my eyes) much more consistent
tests ast-lowering lints introduced by Infrastructure for lints during attribute parsing, specifically duplicate usages of attributes #138164 since this is now useful for the first time
Coalesce some useless error codes

Builds on top of #138164

jdonszelmann · 2025-03-08T23:37:17Z

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -584,7 +546,6 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
            return OptimizeAttr::Default;
        };

-        inline_span = Some(attr.span());


This fixes #137950

bors · 2025-03-11T05:03:38Z

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

jdonszelmann · 2025-06-09T22:54:26Z

@rustbot review

jdonszelmann · 2025-06-09T23:21:16Z

ah shit, broke clippy 😭

jdonszelmann · 2025-06-10T11:58:12Z

tests/ui/attributes/rustc_confusables.stderr

   |
-LL |     #[rustc_confusables("invalid_meta_item")]
-   |                         +                 +
+LL |     #[rustc_confusables(invalid_meta_item)]


rewording, arguably worse but consistent with other error messages with a consistent error code (as opposed to a dedicated diagnostic for this attribute only)

jdonszelmann · 2025-06-10T11:59:05Z

compiler/rustc_error_codes/src/error_codes/E0534.md

 The `inline` attribute was malformed.

 Erroneous code example:

-```compile_fail,E0534


no longer emitted because it's specific to inline. I kind of want to avoid those in favor of generic attribute related error codes

jdonszelmann · 2025-06-10T12:00:09Z

compiler/rustc_error_codes/src/error_codes/E0539.md

@@ -49,3 +48,29 @@ struct Stable;
 #[rustc_const_stable(feature = "stable_fn", since = "1.39.0")] // ok!
 const fn stable_fn() {}
 ```


error code upgraded to represent the more generic issue of the structure of an attribute not matching the expected structure

jdonszelmann · 2025-06-10T12:00:31Z

compiler/rustc_error_codes/src/error_codes/E0540.md

+Erroneous code example:
+
+```compile_fail,E0540
+#[inline()] // error! should either have a single argument, or no parentheses


new generic error code for argument mismatch. 540 was not used.

jdonszelmann · 2025-06-10T12:01:42Z

tests/ui/deprecation/deprecation-sanity.stderr

   |
 LL |     #[deprecated(since = "a", note)]
-   |                               ^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^----^^


much more detailed error messages

jdonszelmann · 2025-06-10T12:03:09Z

tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr

@@ -313,6 +303,16 @@ error[E0517]: attribute should be applied to a struct, enum, or union
 LL |     #[repr(Rust)] impl S { }
   |            ^^^^   ---------- not a struct, enum, or union

+error: valid forms for the attribute are `#[inline(always|never)]` and `#[inline]`
+  --> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:44:5
+   |


error message moved

jdonszelmann · 2025-06-10T12:04:28Z

tests/ui/force-inlining/invalid.stderr

   |
-LL | fn barqux(#[rustc_force_inline] _x: u32) {}


I think this is a genuine regression, I think because check_attr now has to see this as a parsed attribute, let me fix that

jdonszelmann · 2025-06-10T12:06:27Z

tests/ui/macros/genercs-in-path-with-prettry-hir.stdout

@@ -8,7 +8,7 @@ extern crate std;
 // issue#97006

 macro_rules! m { ($attr_path: path) => { #[$attr_path] fn f() {} } }
-#[inline]
+#[attr = Inline(Hint)]


@obi1kenobi is this one relevant for CSC? I'm going to upgrade more attributes like this I'm afraid

Thanks for the ping! I think we don't SemVer-check based on it, but we do parse it so it'd be great to go back to emitting it as #[inline] in rustdoc JSON in a separate PR if possible. cc @aDotInTheVoid

mhm, I messaged Alona today as well, since it's technically also a breaking change in rustdoc json. However, it's really annoying since I'll be making about a 100 separate breaking changes like this in the coming months.... and practically few people will care

at the very least the debug representation is much more consistent nowadays. However, I think the solution is not to see this as a breaking change in the format, but just an unspecified part of the format you can't rely on at the moment until we stabilize it in a more structured way...

I think the solution is not to see this as a breaking change in the format, but just an unspecified part of the format you can't rely on at the moment

I think this is a fine mental model but I think it'll be frustrating to many users regardless, because we've given plenty of time to Hyrum's Law to kick in here.

Telling broken users "we're technically right, it was your assumptions that were wrong" will not make them any happier about it. So I think we should approach this situation with empathy for those users, and attempt to do what we can to minimize the negative impact as best as circumstances allow.

jdonszelmann · 2025-06-10T12:08:50Z

note, there are tests that tests the newly emitted lints during attr parsing. However, it works so well, none of them changed! They are emitted though, but exactly the same as they already were so it doesn't show up in the diff. Hard to check, but great!

bors · 2025-06-10T21:24:36Z

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

lint on duplicates during attribute parsing To do this we stuff them in the diagnostic context to be emitted after hir is constructed

jdonszelmann · 2025-06-11T06:40:01Z

ugh, the rebase

rustbot assigned oli-obk Mar 7, 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 Mar 7, 2025

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the inline branch from f2f2286 to 93a2322 Compare March 8, 2025 19:05

This comment has been minimized.

Sign in to view

jdonszelmann commented Mar 8, 2025

View reviewed changes

jdonszelmann force-pushed the inline branch 2 times, most recently from e6dad01 to 2a707bf Compare March 9, 2025 15:34

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the inline branch from 2a707bf to 7787c54 Compare March 9, 2025 16:09

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the inline branch from 7787c54 to 251ad20 Compare March 9, 2025 20:10

jdonszelmann mentioned this pull request Mar 9, 2025

rewrite optimize attribute to use new attribute parsing infrastructure #138291

Draft

oli-obk 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 Apr 28, 2025

jdonszelmann force-pushed the inline branch 2 times, most recently from b7dda57 to 88a713a Compare June 9, 2025 22:40

This comment has been minimized.

Sign in to view

jdonszelmann mentioned this pull request Jun 9, 2025

Infrastructure for lints during attribute parsing, specifically duplicate usages of attributes #138164

Open

jdonszelmann force-pushed the inline branch from 88a713a to e44a373 Compare June 9, 2025 22:50

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

This comment has been minimized.

Sign in to view

jdonszelmann mentioned this pull request Jun 9, 2025

Exhaustively handle parsed attributes in CheckAttr #140372

Merged

jdonszelmann force-pushed the inline branch from e44a373 to 2751f40 Compare June 10, 2025 06:53

jdonszelmann commented Jun 10, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the inline branch from ead976a to 0117bb4 Compare June 10, 2025 13:10

rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label Jun 10, 2025

jdonszelmann force-pushed the inline branch from 0117bb4 to 3446ca2 Compare June 10, 2025 22:19

jdonszelmann and others added 4 commits June 11, 2025 00:23

introduce duplicate attribute diagnostic logic

fdf4d02

Start using new diagnostic logic on all existing single parsers

ea1d1fc

introduce new lint infra

b30e58e

lint on duplicates during attribute parsing To do this we stuff them in the diagnostic context to be emitted after hir is constructed

add error message for unused duplicate

bcd5a33

jdonszelmann force-pushed the inline branch from 3446ca2 to dda1c4a Compare June 10, 2025 22:28

This comment has been minimized.

Sign in to view

jdonszelmann and others added 4 commits June 11, 2025 08:38

remove 'static in some places

92205a2

implement inline parser

edabf19

implement rustc_force_inline parser

c99937b

convert entire codebase to parsed inline attrs

7da8837

jdonszelmann added 4 commits June 11, 2025 09:05

fix bugs in inline/force_inline and diagnostics of all attr parsers

f604f44

use consistent attr errors in all attribute parsers

952ecb4

make error codes reflect reality better

3700ec2

fix clippy

d275cc3

jdonszelmann force-pushed the inline branch from dda1c4a to d275cc3 Compare June 11, 2025 07:06

Rewrite inline attribute parser to use new infrastructure and improve diagnostics for all parsed attributes #138165

Are you sure you want to change the base?

Rewrite inline attribute parser to use new infrastructure and improve diagnostics for all parsed attributes #138165

Conversation

jdonszelmann commented Mar 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

bors commented Mar 11, 2025

Uh oh!

This comment has been minimized.

jdonszelmann commented Jun 9, 2025

Uh oh!

This comment has been minimized.

jdonszelmann commented Jun 9, 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!

jdonszelmann Jun 10, 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!

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 Jun 10, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jdonszelmann commented Jun 10, 2025

Uh oh!

This comment has been minimized.

bors commented Jun 10, 2025

Uh oh!

This comment has been minimized.

jdonszelmann commented Jun 11, 2025

Uh oh!

Uh oh!

Rewrite `inline` attribute parser to use new infrastructure and improve diagnostics for all parsed attributes #138165

Rewrite `inline` attribute parser to use new infrastructure and improve diagnostics for all parsed attributes #138165

jdonszelmann commented Mar 7, 2025 •

edited

Loading

jdonszelmann Jun 10, 2025 •

edited

Loading

jdonszelmann Jun 10, 2025 •

edited

Loading