Skip to content

Remove the rustc_data_structures::assert_matches! re-exports#153553

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Zalathar:assert-matches
Mar 8, 2026
Merged

Remove the rustc_data_structures::assert_matches! re-exports#153553
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Zalathar:assert-matches

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Mar 8, 2026

Now that the bootstrap stage0 compiler has been bumped to 1.95, we can remove these temporary re-exports from rustc_data_structures, and once again import the assert_matches! macros directly from std.

@rustbot
Copy link
Collaborator

rustbot commented Mar 8, 2026

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

Some changes occurred in match lowering

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to constck

cc @fee1-dead

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred to the core trait solver

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

HIR ty lowering was modified

cc @fmease

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 8, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 8, 2026

r? @dingxiangfei2009

rustbot has assigned @dingxiangfei2009.
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 69 candidates
  • Random selection from 16 candidates

@lqd
Copy link
Member

lqd commented Mar 8, 2026

r? me @bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

📌 Commit 40b9f1d has been approved by lqd

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 Mar 8, 2026
@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 Mar 8, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Mar 8, 2026

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.

@Zalathar
Copy link
Member Author

Zalathar commented Mar 8, 2026

Resolved a conflict with one of the occurrences having been deleted.

@bors r=lqd

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

📌 Commit 985b41d has been approved by lqd

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 Mar 8, 2026
rust-bors bot pushed a commit that referenced this pull request Mar 8, 2026
@bors
Auto merge of #153553 - Zalathar:assert-matches, r=lqd
b793198 
Remove the `rustc_data_structures::assert_matches!` re-exports

- #151359
- #153462
---

Now that the bootstrap stage0 compiler has been bumped to 1.95, we can remove these temporary re-exports from `rustc_data_structures`, and once again import the `assert_matches!` macros directly from std.
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026 •
edited
Loading

⌛ Testing commit 985b41d with merge b793198...

Workflow: https://github.com/rust-lang/rust/actions/runs/22820392884

@Zalathar
Copy link
Member Author

Zalathar commented Mar 8, 2026

@bors yield

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

Auto build was cancelled. Cancelled workflows:

The next pull request likely to be tested is #153530.

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 8, 2026
@JonathanBrouwer
Rollup merge of rust-lang#153553 - Zalathar:assert-matches, r=lqd
af3e256 
Remove the `rustc_data_structures::assert_matches!` re-exports

- rust-lang#151359
- rust-lang#153462
---

Now that the bootstrap stage0 compiler has been bumped to 1.95, we can remove these temporary re-exports from `rustc_data_structures`, and once again import the `assert_matches!` macros directly from std.
This was referenced Mar 8, 2026
Closed
Merged
rust-bors bot pushed a commit that referenced this pull request Mar 8, 2026
@bors
Auto merge of #153576 - JonathanBrouwer:rollup-oZYO7KY, r=JonathanBro…
b41f22d 
…uwer

Rollup of 4 pull requests

Successful merges:

 - #153464 (Use `&C::Key` less in queries.)
 - #153553 (Remove the `rustc_data_structures::assert_matches!` re-exports)
 - #153561 (Replace the `try_mark_green` hook with direct calls to `tcx.dep_graph`)
 - #153564 (rendering interpreter OOM as OOM instead of ICE)
@rust-bors rust-bors bot merged commit 1163601 into rust-lang:main Mar 8, 2026
11 of 12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 8, 2026
rust-timer added a commit that referenced this pull request Mar 8, 2026
@rust-timer
Unrolled build for #153553
82a2b89 
Rollup merge of #153553 - Zalathar:assert-matches, r=lqd

Remove the `rustc_data_structures::assert_matches!` re-exports

- #151359
- #153462
---

Now that the bootstrap stage0 compiler has been bumped to 1.95, we can remove these temporary re-exports from `rustc_data_structures`, and once again import the `assert_matches!` macros directly from std.
@Zalathar Zalathar deleted the assert-matches branch March 8, 2026 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@lqd lqd

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Zalathar @rustbot @lqd @dingxiangfei2009