rustc_attr_ir: fix up `lang_items` imports by mejrs · Pull Request #160782 · rust-lang/rust

mejrs · 2026-08-08T23:09:56Z

Cleanup after splitting attributes from rustc_hir.

It's a big one and maybe annoying to merge without conflicts but I figured it's best to just get it done and over with. If it turns out to be too big to merge at once it should be possible to split it up tho :>

r? @JonathanBrouwer

rustbot · 2026-08-08T23:10:00Z

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

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.

Some changes occurred in match lowering

cc @Nadrieril

Some changes occurred in match checking

cc @Nadrieril

clippy is developed in its own repository. If possible, consider making this change to rust-lang/rust-clippy instead.

cc @rust-lang/clippy

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @vakaras

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to constck

cc @fee1-dead

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

Some changes occurred in compiler/rustc_sanitizers

cc @rcvalle

Some changes occurred in compiler/rustc_attr_ir

cc @jdonszelmann, @JonathanBrouwer

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann, @JonathanBrouwer

HIR ty lowering was modified

cc @fmease

changes to the core type system

cc @lcnr

Some changes occurred in compiler/rustc_ast_lowering/src/format.rs

cc @m-ou-se

rustc_codegen_cranelift is developed in its own repository. If possible, consider making this change to rust-lang/rustc_codegen_cranelift instead.

cc @bjorn3

rustbot · 2026-08-09T08:41:41Z

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.

rustbot · 2026-08-09T08:58:21Z

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

rustbot · 2026-08-09T09:43:59Z

rustc_codegen_gcc is developed in its own repository. If possible, consider making this change to rust-lang/rustc_codegen_gcc instead.

cc @antoyo, @GuillaumeGomez

Some changes occurred in coverage instrumentation.

cc @Zalathar

rustc-dev-guide is developed in its own repository. If possible, consider making this change to rust-lang/rustc-dev-guide instead.

cc @BoxyUwU, @tshepang

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

mejrs · 2026-08-09T10:12:24Z

@rustbot ready

I think we should not attempt to merge this in a rollup :) But we best do it today (in the weekend) to minimize disruption.

JonathanBrouwer · 2026-08-09T10:17:07Z

                // removing it.
                // This was added in <https://github.com/rust-lang/rust/pull/123302>.
-                if tcx.is_lang_item(trait_def_id, rustc_hir::LangItem::Sized) {
+                if tcx.is_lang_item(trait_def_id, rustc_hir::attrs::lang::LangItem::Sized) {


nit: this can just use the import

View changes since the review

If this is the only thing I find I'd lean towards not fixing it as to not restart PR ci

JonathanBrouwer · 2026-08-09T10:22:34Z

@@ -57,7 +57,7 @@ This macro can be used in the following ways:
 * `find_attr!(tcx, <def_id>, Variant(...))` to find an attribute on a def id.
 * `find_attr!(tcx, <hir_id>, Variant(...))` to find an attribute on a HIR id.
 * `find_attr!(tcx, crate, Variant(...))` to find an attribute on the current crate.
-* `find_attr!(attrs, Variant(...))` to find an attribute in attrs, a `&[hir::Attribute]`.
+* `find_attr!(attrs, Variant(...))` to find an attribute in attrs, a `&[Attribute]`.


This PR in quite a few cases makes it ambiguous which Attribute type is meant, (ast::Attribute or hir::attrs::Attribute = rustc_attr_ir::Attribute), which I don't really like

View changes since the review

I was planning to fix up the guide later, this is an accidental search and replace.

Note that not all of the dev guide can be updated in this PR because it will run link checker and the links are hardcoded to https://doc.rust-lang.org/nightly/nightly-rustc

JonathanBrouwer · 2026-08-09T10:23:15Z

@@ -790,7 +789,7 @@ fn handle_auto_cfg_hide_show(cfg_info: &mut CfgInfo, attr: &CfgHideShow) {
    }
 }

-pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute> + Clone>(
+pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a Attribute> + Clone>(


here as well by importing the attribute type

View changes since the review

JonathanBrouwer · 2026-08-09T10:28:36Z

Why was this rename done? I think the old name is more clear, since this file is about lang items, not about the entire language

View changes since the review

it's shorter, and the attribute is #[lang = ..], not #[lang_item = ...]. Happy to revert it if you want.

The attribute name is the only place where lang is used, they're called lang items everywhere else

JonathanBrouwer

I think I'm leaning towards splitting up this PR because there is some stuff that I'd still like to have some time to think about, such as having the rustc_hir::attrs re-export, and keeping this PR open for longer than a few days is impossible because it will conflict with absolutely everything.

One change that is quite a large part of the diff of this PR that I'm happy to merge is importing LangItem everywhere, instead of calling it hir::LangItem, maybe we can start with this?

View changes since this review

mejrs · 2026-08-09T10:36:26Z

One change that is quite a large part of the diff of this PR that I'm happy to merge is importing LangItem everywhere, instead of calling it hir::LangItem, maybe we can start with this?

Sure, let's start there :)

mejrs · 2026-08-09T11:32:30Z

@rustbot ready

This is only the lang_items related imports. It looks like some unrelated things also got formatted 🤔

JonathanBrouwer · 2026-08-09T11:41:07Z


                    // Check for newlines in the chunk
-                    let newlines_test = lsx_vseqi_b::<{b'\n' as i32}>(chunk);
+                    let newlines_test = lsx_vseqi_b::<{ b'\n' as i32 }>(chunk);


Hmmm this PR contains quite a few formatting changes like this, I think all of them are improvements so it's fine to keep them but wonder what causes it

View changes since the review

I had to use cargo fmt to format clippy, but I'm pretty sure I always was in the clippy root when I did 🤔

JonathanBrouwer

r=me with green ci

View changes since this review

rustbot assigned JonathanBrouwer Aug 8, 2026

This comment has been minimized.

Sign in to view

mejrs force-pushed the attr_imports branch from 5938bdc to d02459f Compare August 9, 2026 08:41

JonathanBrouwer reviewed Aug 9, 2026

View reviewed changes

Comment thread compiler/rustc_attr_parsing/src/session_diagnostics.rs Outdated

JonathanBrouwer reviewed Aug 9, 2026

View reviewed changes

Comment thread compiler/rustc_hir/src/lib.rs Outdated

mejrs force-pushed the attr_imports branch from d02459f to 87af9ab Compare August 9, 2026 08:48

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 9, 2026

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 9, 2026

rustbot added the A-rustc-dev-guide Area: rustc-dev-guide label Aug 9, 2026

mejrs force-pushed the attr_imports branch from 6bf2931 to 9019d77 Compare August 9, 2026 09:50

JonathanBrouwer reviewed Aug 9, 2026

View reviewed changes

Comment thread compiler/rustc_attr_parsing/Cargo.toml

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

JonathanBrouwer reviewed Aug 9, 2026

View reviewed changes

Comment thread src/librustdoc/json/conversions.rs Outdated

JonathanBrouwer reviewed Aug 9, 2026

View reviewed changes

JonathanBrouwer requested changes Aug 9, 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 Aug 9, 2026

This comment has been minimized.

Sign in to view

mejrs force-pushed the attr_imports branch from 9019d77 to 3193ab0 Compare August 9, 2026 11:28

mejrs changed the title ~~rustc_attr_ir: fix up imports~~ rustc_attr_ir: fix up lang_items imports Aug 9, 2026

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

This comment has been minimized.

Sign in to view

JonathanBrouwer reviewed Aug 9, 2026

View reviewed changes

JonathanBrouwer approved these changes Aug 9, 2026

View reviewed changes

mejrs force-pushed the attr_imports branch from 3193ab0 to 31574b8 Compare August 9, 2026 11:44

This comment has been minimized.

Sign in to view

mejrs force-pushed the attr_imports branch from 31574b8 to 778e509 Compare August 9, 2026 11:54

This comment has been minimized.

Sign in to view

Fix up lang_items import paths

196dd2a

mejrs force-pushed the attr_imports branch from 778e509 to 196dd2a Compare August 9, 2026 13:20

Uh oh!

Uh oh!

Conversation

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

Uh oh!

Uh oh!

rustbot commented Aug 8, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented Aug 9, 2026

Uh oh!

Uh oh!

Uh oh!

rustbot commented Aug 9, 2026

Uh oh!

rustbot commented Aug 9, 2026

Uh oh!

Uh oh!

mejrs commented Aug 9, 2026

Uh oh!

JonathanBrouwer Aug 9, 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!

JonathanBrouwer Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

JonathanBrouwer Aug 9, 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 Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

mejrs Aug 9, 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!

JonathanBrouwer Aug 9, 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!

Uh oh!

JonathanBrouwer Aug 9, 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 Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

JonathanBrouwer Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

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

This comment has been minimized.

mejrs commented Aug 9, 2026

Uh oh!

mejrs commented Aug 9, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer Aug 9, 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 Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

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

This comment has been minimized.

This comment has been minimized.

Reviewers

Assignees

Labels

mejrs commented Aug 8, 2026 •

edited by rustbot

Loading

JonathanBrouwer Aug 9, 2026 •

edited by rustbot

Loading

JonathanBrouwer Aug 9, 2026 •

edited by rustbot

Loading

mejrs Aug 9, 2026 •

edited

Loading

JonathanBrouwer Aug 9, 2026 •

edited by rustbot

Loading

JonathanBrouwer Aug 9, 2026 •

edited by rustbot

Loading

JonathanBrouwer left a comment •

edited by rustbot

Loading

JonathanBrouwer Aug 9, 2026 •

edited by rustbot

Loading

JonathanBrouwer left a comment •

edited by rustbot

Loading