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-11T06:40:01Z

ugh, the rebase

bors · 2025-06-12T01:32:30Z

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

…ra, r=oli-obk Infrastructure for lints during attribute parsing, specifically duplicate usages of attributes r? `@oli-obk` This PR adds a new field to OwnerInfo to buffer lints which are generated during attribute parsing and ast lowering in general. They can't be emitted at this stage because at that point there's no HIR yet, and early lints are already emitted. This also adds the generic `S: Stage` to attribute parsers. Currently we don't emit any lints during early attribute parsing, but if we ever want to that logic will be different. That's because there we don't have hir ids yet, while at the same time still having access to node ids and early lints. Even though that logic isn't completely there in this PR (no worries, we don't use it), that's why the parameter is there. With this PR, we also add 2 associated consts to `SingleAttributeParser`. Those determine what logic should be applied when finding a duplicate attribute. This PR was getting pretty large, so the first code using this logic is in rust-lang#138165. This code is all new things that weren't possible before so it also doesn't break any behaviour. However, some of it will be dead code right now. I recommend reviewing both before merging, though in some sense that doubles the size of the review again, and the other PR might be more controversial. Let me know how you want to do this `@oli-obk`

Infrastructure for lints during attribute parsing, specifically duplicate usages of attributes r? `@oli-obk` This PR adds a new field to OwnerInfo to buffer lints which are generated during attribute parsing and ast lowering in general. They can't be emitted at this stage because at that point there's no HIR yet, and early lints are already emitted. This also adds the generic `S: Stage` to attribute parsers. Currently we don't emit any lints during early attribute parsing, but if we ever want to that logic will be different. That's because there we don't have hir ids yet, while at the same time still having access to node ids and early lints. Even though that logic isn't completely there in this PR (no worries, we don't use it), that's why the parameter is there. With this PR, we also add 2 associated consts to `SingleAttributeParser`. Those determine what logic should be applied when finding a duplicate attribute. This PR was getting pretty large, so the first code using this logic is in #138165. This code is all new things that weren't possible before so it also doesn't break any behaviour. However, some of it will be dead code right now. I recommend reviewing both before merging, though in some sense that doubles the size of the review again, and the other PR might be more controversial. Let me know how you want to do this `@oli-obk`

rustbot · 2025-06-12T23:12:31Z

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

These commits modify tests/rustdoc-json.
rustdoc-json is a public (but unstable) interface.

Please ensure that if you've changed the output:

It's intentional.
The FORMAT_VERSION in src/librustdoc-json-types is bumped if necessary.

cc @aDotInTheVoid, @obi1kenobi

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

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.

compiler/rustc_attr_data_structures/src/attributes.rs

bors · 2025-06-13T08:40:56Z

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

mejrs · 2025-06-14T10:32:31Z

compiler/rustc_attr_data_structures/src/attributes.rs

-
    /// Represents `#[stable]`, `#[unstable]` and `#[rustc_allowed_through_unstable_modules]`.


imo we should keep the empty line for consistency with the other variants.

mejrs · 2025-06-14T11:33:23Z

compiler/rustc_attr_data_structures/src/attributes.rs

@@ -188,12 +188,14 @@ pub enum AttributeKind {
    /// Represents [`#[doc]`](https://doc.rust-lang.org/stable/rustdoc/write-documentation/the-doc-attribute.html).
    DocComment { style: AttrStyle, kind: CommentKind, span: Span, comment: Symbol },

+    /// Represents `#[inline]`.


Suggested change

/// Represents `#[inline]`.

/// Represents `#[inline]` and `#[rustc_force_inline]`.

mejrs · 2025-06-14T11:37:29Z

compiler/rustc_attr_parsing/src/context.rs

+        Single<InlineParser>,
+        Single<RustcForceInlineParser>,


Should this be a single parser, just a impl AttributeParser for InlineParser that handles both of them? Also we currently don't raise an error for

#[inline(never)] #[rustc_force_inline] fn blah(){}

and i think we should.

mejrs · 2025-06-14T11:52:27Z

compiler/rustc_attr_parsing/src/context.rs

+    pub(crate) fn expected_string_literal(
+        &self,
+        span: Span,
+        actual_literal: Option<&MetaItemLit>,


"actual" is a bit ambiguous IMO

Suggested change

actual_literal: Option<&MetaItemLit>,

found: Option<&MetaItemLit>,

(Or, found_literal, perhaps)

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