Skip to content

Update deprecated rustc_hir imports - #163170

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
mejrs:hir_imports
Sep 23, 2026
Merged

Update deprecated rustc_hir imports#163170
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
mejrs:hir_imports

Conversation

@mejrs

@mejrs mejrs commented Sep 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Followup to #160336

That's ~half of them, I'm not doing it all in one go to reduce conflicts.

@rustbot

rustbot commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

This PR changes MIR

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

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

cc @jdonszelmann, @JonathanBrouwer

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

cc @rust-lang/clippy

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

cc @m-ou-se

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 rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 22, 2026
@rustbot

rustbot commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

r? @oli-obk

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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 77 candidates
  • Random selection from 18 candidates

oli-obk
oli-obk reviewed Sep 22, 2026
View reviewed changes
Comment thread compiler/rustc_ast_lowering/src/delegation/attributes.rs

struct AdditionInfo {
pub equals: fn(&hir::Attribute) -> bool,
pub equals: fn(&rustc_attr_ir::Attribute) -> bool,

@oli-obk oli-obk Sep 22, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Writing that out everywhere seems unfortunate. Maybe just import them?

View changes since the review

@mejrs mejrs Sep 22, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I would do that elsewhere but this is rustc_ast_lowering, and the convention there is that generally there's an use rustc_ast::*; at the top of the file, so a bare Attribute would be ambiguous.

@oli-obk

oli-obk commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

Is there some previous work or an issue? If so pls link it from the main post

@mejrs

mejrs commented Sep 22, 2026

Copy link
Copy Markdown
Member Author

Is there some previous work or an issue? If so pls link it from the main post

#160336 and rust-lang/rust-clippy/pull/17714

@oli-obk

oli-obk commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

@bors r+ rollup=iffy

@rust-bors

rust-bors Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3c7c76c has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Sep 22, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 22, 2026
@JonathanBrouwer
Rollup merge of rust-lang#163170 - mejrs:hir_imports, r=oli-obk
9ba8cc9 
Update deprecated rustc_hir imports

Followup to rust-lang#160336

That's ~half of them, I'm not doing it all in one go to reduce conflicts.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 22, 2026
Closed
@rust-bors rust-bors Bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 22, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rustbot

rustbot commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

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.

@mejrs

mejrs commented Sep 22, 2026

Copy link
Copy Markdown
Member Author

@bors r=oli-obk

@rust-bors

rust-bors Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 78d478a has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 22, 2026
@mu001999 mu001999 mentioned this pull request Sep 23, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Sep 23, 2026
@bors
Auto merge of #163189 - mu001999:rollup-B1doDX5, r=mu001999
4f37171 
Rollup of 7 pull requests

Successful merges:

 - #163170 (Update deprecated rustc_hir imports)
 - #156882 (alloc: stabilise `Allocator`)
 - #163121 (Borrow the destination place with a raw pointer in MIR inlining)
 - #162824 (link the offload with in-tree lld if possible)
 - #163018 (implement (OnceLock,LazyLock)::(get_unchecked,get_unchecked_mut))
 - #163171 (Make it clear what the alignment needs to be for `deallocate`)
 - #163176 (Test unused lifetime params for 'type' and 'union')
@rust-bors
rust-bors Bot merged commit af2ca52 into rust-lang:main Sep 23, 2026
13 checks passed
rust-bors Bot pushed a commit that referenced this pull request Sep 23, 2026
@bors
Unrolled build for #163170 in rollup 163189
b3e0fe6 
Rollup merge of #163170 - mejrs:hir_imports, r=oli-obk

Update deprecated rustc_hir imports

Followup to #160336

That's ~half of them, I'm not doing it all in one go to reduce conflicts.
@rustbot rustbot added this to the 1.100.0 milestone Sep 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.100.0

Development

Successfully merging this pull request may close these issues.

3 participants

@mejrs @rustbot @oli-obk