Port `#[crate_name]` to the new attribute parsing infrastructure #137729

jdonszelmann · 2025-02-27T13:57:10Z

r? @fmease

Closes #137687

compiler/rustc_driver_impl/src/lib.rs

compiler/rustc_attr_data_structures/src/attributes.rs

compiler/rustc_attr_parsing/src/attributes/crate_name.rs

jdonszelmann · 2025-03-06T16:12:47Z

@fmease and I decided to delay this PR for a bit until more diagnostic infra for attrs lands (hopefully next week) to make the duplicate error a warning to be consistent with current master.

fmease · 2025-03-06T16:14:30Z

r=fmease,bjorn3 once that PR lands and you can downgrade the error to a lint warning again.

@bors delegate+

bors · 2025-03-06T16:14:34Z

✌️ @jdonszelmann, you can now approve this pull request!

If @fmease told you to "r=me" after making some further change, please make that change, then do @bors r=@fmease

wesleywiser · 2025-04-24T14:46:44Z

Hi @jdonszelmann and @fmease, #137687 has reached beta so it would be great if we could resolve that via a beta-backport of this PR. Do you think it's possible to resolve the review feedback and merge this PR in the next week or so?

I can probably pitch in to help if necessary 🙂

jdonszelmann · 2025-04-24T14:50:11Z

Hi there. We wanted to delay this until attribute diagnostics. Something that should not be a lot of work but I have not worked as much on recently as I maybe should. I can't to this tomorrow, but likely next week. The pr has been reviewed but there was a bit of an issue around incremental, which I now know how to solve but just haven't yet. Is that a reasonable timeframe? I am pretty busy with organising rust week atm, but knowing the solution I guess the only important thing is that it gets quick reviews? Let me know how that sounds

wesleywiser · 2025-04-24T14:53:12Z

Just to clarify, will this PR then depend on the attribute diagnostics work? (Is that #138164?)

Generally, for backports, we try to keep the backport as small as possible so if this PR can be made to work independently of that PR (possibly even with a degraded diagnostics experience), that would be highly preferred.

jdonszelmann · 2025-04-24T16:28:00Z

No. We decided to delay this because it's relatively low prio and any nice and permanent solution for this depends on that. I'll make a temp fix that at least doesn't ice separately then, that sounds better for now. I don't mind doing it, I know the problem now and then I also know how to fix it permanently later. You'll hear from me

theemathas · 2025-05-01T14:19:57Z

Note that #137687 actually has two separate problems/subissues:

A problem (lower priority) involving the #[crate_name] attribute.
A problem (higher priority, found in a crater run) involving user-defined macro_rules and derive macros.

This PR only appears to address the first problem. The second problem would probably need to have a separate fix.

jdonszelmann · 2025-05-02T13:23:01Z

ok this is weird, I've copied just the tests over to master to fix it in a temporary way, but can no longer reporoduce the issue. Something else must have solved it in the meantime. Let me see what.

jieyouxu · 2025-05-03T09:36:54Z

(I know I've said this in the other PR too, but just in case)

Just a heads up: I split #137687 into two issues:

ICE: expr in place where literal is expected (builtin attr parsing) #137687 is used to track Matthias's fuzzed regression (the #[crate_name = concat!("Cloneb")] one).
regression: ICE: expr in place where literal is expected (builtin attr parsing) #140612 is used to track the crater regressions (known to affect user macros)

jdonszelmann · 2025-08-12T10:01:12Z

@rustbot review

jdonszelmann · 2025-08-19T12:15:29Z

@rustbot review

bors · 2025-08-19T23:36:23Z

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

rustbot · 2025-08-21T11:06:31Z

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.

rustbot · 2025-08-21T11:06:34Z

This PR was rebased onto a different master 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.

fmease

Some small comments. r=me with nits addressed in one way or another

View changes since this review

fmease · 2025-08-21T11:35:16Z

compiler/rustc_lint_defs/Cargo.toml

@@ -9,7 +9,7 @@ rustc_abi = { path = "../rustc_abi" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_error_messages = { path = "../rustc_error_messages" }
-rustc_hir_id = { path = "../rustc_hir_id" }


Partially undoes #145390 but I guess that's unavoidable (we'd need to move DefPathHash and AttributeLintKind to rustc_hir_id to be able to revert that which wouldn't make sense). #145390 was simply "overfitting" you could say.

sigh, I actually considered making a similar change in the past but found it too destructive of a thing to do and found other solutions. Was very surprised when I saw someone else ended up doing this anyway 🙃

I'll move that some day in another PR

fmease · 2025-08-21T11:43:43Z

compiler/rustc_attr_parsing/src/attributes/crate_level.rs

+        let Some(name) = n.value_as_str() else {
+            cx.expected_string_literal(n.value_span, Some(n.value_as_lit()));
+            return None;
+        };


Does this regress #[crate_name = concat!("x")] fn f() {}? I guess it won't because concat! is already expanded by then?

fmease · 2025-08-21T11:53:36Z

compiler/rustc_errors/src/lib.rs

As discussed, AttributeLintDecoratorOrEmitter, decorate_or_emit, etc. would be more accurate.

Or going vague, AttributeLintHandler, fn handle, DeferredAttributeLintHandler, type Handler: …;.

But if you feel it's too churny to go rename them again, it's okay to leave it.

fmease · 2025-08-21T12:01:04Z

compiler/rustc_interface/src/passes.rs

@@ -1244,8 +1246,7 @@ pub fn get_crate_name(sess: &Session, krate_attrs: &[ast::Attribute]) -> Symbol
    // in all code paths that require the crate name very early on, namely before
    // macro expansion.

-    let attr_crate_name =
-        validate_and_find_value_str_builtin_attr(sym::crate_name, sess, krate_attrs);


(once we port #[recursion_limit], we can get rid of validate_and_find_value_str_builtin_attr)

fmease · 2025-08-21T12:05:59Z

compiler/rustc_lint/src/early/diagnostics.rs

+    }
+}
+
+struct DiagEmitter<'a, 'b>(&'a mut Diag<'b, ()>);


Suggested change

struct DiagEmitter<'a, 'b>(&'a mut Diag<'b, ()>);

struct DiagDecorator<'a, 'b>(&'a mut Diag<'b, ()>);

fmease · 2025-08-21T12:06:42Z

compiler/rustc_middle/src/ty/context.rs

@@ -1417,15 +1418,24 @@ pub struct TyCtxt<'tcx> {
    gcx: &'tcx GlobalCtxt<'tcx>,
 }

-impl<'tcx> LintEmitter for TyCtxt<'tcx> {
-    fn emit_node_span_lint(
+pub struct Decorator<'tcx>(TyCtxt<'tcx>, &'static Lint, HirId, MultiSpan);


Suggested change

pub struct Decorator<'tcx>(TyCtxt<'tcx>, &'static Lint, HirId, MultiSpan);

pub struct Emitter<'tcx>(TyCtxt<'tcx>, &'static Lint, HirId, MultiSpan);

fmease · 2025-08-21T12:07:18Z

compiler/rustc_passes/src/check_attr.rs

-                    match style {
-                        Some(ast::AttrStyle::Outer) => self.tcx.emit_node_span_lint(
+                match attr {
+                    // FIXME(jdonszelmann) after https://github.com/rust-lang/rust/pull/145085 merges, move to attribute parsing


(#145085 has been merged)

fmease · 2025-08-21T12:12:12Z

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

   |
 LL | #[crate_name = "0900"]
-   | ^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^^^


Wait, the highlight should span the entire attribute; the problem isn't with the string literal (contrary to diagnostics like crate name must not be empty or `--crate-name` and `#[crate_name]` are required to match)

fmease · 2025-08-21T12:27:15Z

compiler/rustc_interface/src/passes.rs

@@ -1244,8 +1246,7 @@ pub fn get_crate_name(sess: &Session, krate_attrs: &[ast::Attribute]) -> Symbol
    // in all code paths that require the crate name very early on, namely before
    // macro expansion.

-    let attr_crate_name =
-        validate_and_find_value_str_builtin_attr(sym::crate_name, sess, krate_attrs);
+    let attr_crate_name = parse_crate_name(sess, krate_attrs, ShouldEmit::ErrorsAndLints);


Could you please make this raise a FatalError on parse error to address https://github.com/rust-lang/rust/pull/137729/files#r2267446182 or add a FIXME(fmease): Exit fatally on parse error. so I can do so as a follow-up?

fmease · 2025-08-21T12:31:09Z

tests/ui/lint/unused/unused-attr-duplicate.rs

(random file)

Did this PR actually add a regression test for #137687? Did I miss it

rustbot assigned fmease Feb 27, 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 Feb 27, 2025

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the fix-137687 branch from 04bafec to 3898182 Compare February 27, 2025 14:07

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the fix-137687 branch from 3898182 to 81fc9d1 Compare February 27, 2025 14:39

bjorn3 reviewed Feb 27, 2025

View reviewed changes

compiler/rustc_driver_impl/src/lib.rs Outdated Show resolved Hide resolved

jdonszelmann force-pushed the fix-137687 branch 2 times, most recently from 4e90cee to 21838d5 Compare February 27, 2025 16:51

bjorn3 reviewed Feb 27, 2025

View reviewed changes

compiler/rustc_driver_impl/src/lib.rs Outdated Show resolved Hide resolved

jdonszelmann force-pushed the fix-137687 branch from 21838d5 to d1ee9c4 Compare February 27, 2025 17:44

fmease approved these changes Mar 6, 2025

View reviewed changes

compiler/rustc_attr_data_structures/src/attributes.rs Outdated Show resolved Hide resolved

compiler/rustc_attr_parsing/src/attributes/crate_name.rs Outdated Show resolved Hide resolved

compiler/rustc_attr_parsing/src/attributes/crate_name.rs Outdated Show resolved Hide resolved

fmease 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 Mar 6, 2025

This comment was marked as resolved.

Sign in to view

fmease mentioned this pull request May 2, 2025

add test to reproduce #137687 and add a hotfix #140584

Closed

jdonszelmann mentioned this pull request Jun 13, 2025

Tracking issue: Attribute refactor #131229

Open

9 tasks

jdonszelmann force-pushed the fix-137687 branch from d1ee9c4 to 1f5c49f Compare August 11, 2025 12:50

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

jdonszelmann force-pushed the fix-137687 branch from a584056 to 86f64ca Compare August 12, 2025 10:15

This comment was marked as resolved.

Sign in to view

jdonszelmann 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 Aug 14, 2025

jdonszelmann force-pushed the fix-137687 branch from 86f64ca to 56fd2c6 Compare August 16, 2025 07:56

This comment was marked as resolved.

Sign in to view

jdonszelmann force-pushed the fix-137687 branch from 56fd2c6 to 6e298c6 Compare August 19, 2025 12:14

This comment has been minimized.

Sign in to view

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

jdonszelmann force-pushed the fix-137687 branch from 6e298c6 to ae54d0a Compare August 20, 2025 13:33

This comment has been minimized.

Sign in to view

jdonszelmann force-pushed the fix-137687 branch from ae54d0a to c04570f Compare August 20, 2025 14:23

This comment was marked as resolved.

Sign in to view

Port crate name to the new attribute system

e8dac5d

jdonszelmann force-pushed the fix-137687 branch from c04570f to e8dac5d Compare August 21, 2025 11:06

fmease approved these changes Aug 21, 2025

View reviewed changes

fmease changed the title ~~add test to reproduce #137687 and fix it by converting #[crate_name] to a new-style attribute parser~~ Convert #[crate_name] to a new-style attribute parser Aug 21, 2025

fmease reviewed Aug 21, 2025

View reviewed changes

tests/ui/lint/unused/unused-attr-duplicate.rs

Copy link

Member

fmease Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(random file)

Did this PR actually add a regression test for #137687? Did I miss it

fmease 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 Aug 21, 2025

fmease changed the title ~~Convert #[crate_name] to a new-style attribute parser~~ Port #[crate_name] to the new attribute parsing infrastructure Aug 21, 2025

	struct DiagEmitter<'a, 'b>(&'a mut Diag<'b, ()>);
	struct DiagDecorator<'a, 'b>(&'a mut Diag<'b, ()>);

	pub struct Decorator<'tcx>(TyCtxt<'tcx>, &'static Lint, HirId, MultiSpan);
	pub struct Emitter<'tcx>(TyCtxt<'tcx>, &'static Lint, HirId, MultiSpan);

Port #[crate_name] to the new attribute parsing infrastructure #137729

Are you sure you want to change the base?

Port #[crate_name] to the new attribute parsing infrastructure #137729

Conversation

jdonszelmann commented Feb 27, 2025 • edited by rustbot 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.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jdonszelmann commented Mar 6, 2025

Uh oh!

fmease commented Mar 6, 2025

Uh oh!

bors commented Mar 6, 2025

Uh oh!

This comment was marked as resolved.

wesleywiser commented Apr 24, 2025

Uh oh!

jdonszelmann commented Apr 24, 2025

Uh oh!

wesleywiser commented Apr 24, 2025

Uh oh!

jdonszelmann commented Apr 24, 2025

Uh oh!

theemathas commented May 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

jieyouxu commented May 3, 2025

Uh oh!

jdonszelmann commented Aug 12, 2025

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment has been minimized.

jdonszelmann commented Aug 19, 2025

Uh oh!

bors commented Aug 19, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment was marked as resolved.

rustbot commented Aug 21, 2025

Uh oh!

rustbot commented Aug 21, 2025

Uh oh!

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

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!

fmease Aug 21, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Port `#[crate_name]` to the new attribute parsing infrastructure #137729

Port `#[crate_name]` to the new attribute parsing infrastructure #137729

jdonszelmann commented Feb 27, 2025 •

edited by rustbot

Loading

theemathas commented May 1, 2025 •

edited

Loading

jdonszelmann commented May 2, 2025 •

edited

Loading

fmease left a comment •

edited by rustbot

Loading

fmease Aug 21, 2025 •

edited

Loading

fmease Aug 21, 2025 •

edited

Loading