Skip to content

Bootstrap update#153462

Merged
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
cuviper:bootstrap-update
Mar 7, 2026
Merged

Bootstrap update#153462
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
cuviper:bootstrap-update

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Mar 5, 2026

  • Replace version placeholders with 1.95.0
  • Bump stage0 to 1.95.0-beta.1
  • Clear STAGE0_MISSING_TARGETS
  • Update cfg(bootstrap)
  • Reformat with the new stage0

@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2026

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

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

cc @Amanieu, @folkertdev, @sayantn

The run-make-support library was changed

cc @jieyouxu

This PR changes rustc_public

cc @oli-obk, @celinval, @ouz-a, @makai410

@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2026

r? @jackh726

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

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 5, 2026
@Zalathar
Copy link
Member

Zalathar commented Mar 6, 2026

Reminder to myself that after the bootstrap bump has merged, we can remove the re-export of rustc_data_structures::assert_matches! and just import from the standard library again, resolving #151359.

@RalfJung RalfJung mentioned this pull request Mar 6, 2026
Merged
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Mar 6, 2026

@bors r+ rollup=iffy

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 6, 2026

📌 Commit 9c60df8 has been approved by Mark-Simulacrum

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. 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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@cuviper cuviper force-pushed the bootstrap-update branch from 9c60df8 to e1e629c Compare March 7, 2026 01:24
@rustbot

This comment has been minimized.

Sign in to view
@cuviper
Copy link
Member Author

cuviper commented Mar 7, 2026

Simple conflict in the formatting commit alone, resolved.

@bors r=Mark-Simulacrum

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

📌 Commit e1e629c has been approved by Mark-Simulacrum

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 7, 2026
@JonathanBrouwer JonathanBrouwer mentioned this pull request Mar 7, 2026
Closed
@JonathanBrouwer
Copy link
Contributor

JonathanBrouwer commented Mar 7, 2026

@bors r-
#153538 (comment)

@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 7, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

This pull request was unapproved.

This PR was contained in a rollup (#153538), which was unapproved.

@cuviper cuviper force-pushed the bootstrap-update branch from e1e629c to eb093cf Compare March 7, 2026 18:42
@rustbot
Copy link
Collaborator

rustbot commented Mar 7, 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.

@cuviper
Copy link
Member Author

cuviper commented Mar 7, 2026

@bors r=Mark-Simulacrum

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

📌 Commit eb093cf has been approved by Mark-Simulacrum

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 7, 2026
@JonathanBrouwer JonathanBrouwer mentioned this pull request Mar 7, 2026
Merged
rust-bors bot pushed a commit that referenced this pull request Mar 7, 2026
@bors
Auto merge of #153544 - JonathanBrouwer:rollup-LT1ogBG, r=JonathanBro…
e370b60 
…uwer

Rollup of 2 pull requests

Successful merges:

 - #153462 (Bootstrap update)
 - #152210 (Gate #![reexport_test_harness_main] properly)
@rust-bors rust-bors bot merged commit 65a7e52 into rust-lang:main Mar 7, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 7, 2026
rust-timer added a commit that referenced this pull request Mar 7, 2026
@rust-timer
Unrolled build for #153462
e6c7d3c 
Rollup merge of #153462 - cuviper:bootstrap-update, r=Mark-Simulacrum

Bootstrap update

- Replace version placeholders with 1.95.0
- Bump stage0 to 1.95.0-beta.1
- Clear `STAGE0_MISSING_TARGETS`
- Update `cfg(bootstrap)`
- Reformat with the new stage0
This was referenced Mar 8, 2026
Closed
Merged
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Mar 8, 2026
@bors
Auto merge of #153544 - JonathanBrouwer:rollup-LT1ogBG, r=JonathanBro…
d5e0c76 
…uwer

Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#153462 (Bootstrap update)
 - rust-lang/rust#152210 (Gate #![reexport_test_harness_main] properly)
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.
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.
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
1163601 
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.
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.
github-actions bot pushed a commit to rust-lang/stdarch that referenced this pull request Mar 9, 2026
@bors
Auto merge of #153544 - JonathanBrouwer:rollup-LT1ogBG, r=JonathanBro…
6cc71f9 
…uwer

Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#153462 (Bootstrap update)
 - rust-lang/rust#152210 (Gate #![reexport_test_harness_main] properly)
github-actions bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Mar 9, 2026
@bors
Auto merge of #153544 - JonathanBrouwer:rollup-LT1ogBG, r=JonathanBro…
d9ad922 
…uwer

Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#153462 (Bootstrap update)
 - rust-lang/rust#152210 (Gate #![reexport_test_harness_main] properly)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@jackh726 jackh726

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

6 participants

@cuviper @rustbot @Zalathar @Mark-Simulacrum @JonathanBrouwer @jackh726