Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Beta 1.77] Fix bootstrapping from 1.76 #120821

Merged
merged 2 commits into from
Feb 12, 2024

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Feb 9, 2024

Due to the timing of the revert for stabilization of c_str_literal (#119528 which reverted in 1.76) and trait_upcasting (#120269 which reverted in 1.76), which happened after #119211 (Bump stage0 to 1.76 beta), this resulted in some of the feature attributes not being restored which are needed to be able to bootstrap from 1.76. This restores those features.

This also includes a stage0 bump to the just released stable. This is necessary because stage0 was currently pointing at an old beta which did not contain the reverts.

Fixes #120810

@rustbot
Copy link
Collaborator

rustbot commented Feb 9, 2024

r? @cjgillot

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

@rustbot
Copy link
Collaborator

rustbot commented Feb 9, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot rustbot added 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Feb 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 9, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment was marked as resolved.

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Feb 9, 2024
@ehuss
Copy link
Contributor Author

ehuss commented Feb 9, 2024

cc @Mark-Simulacrum

@stefson
Copy link

stefson commented Feb 9, 2024

Hi, the fix is working for me. Please note, there is an update of stage0.json file mixed in here! :-)

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

Makes sense to me.

@bors
Copy link
Contributor

bors commented Feb 9, 2024

📌 Commit ec15d9d has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors 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 Feb 9, 2024
@bors
Copy link
Contributor

bors commented Feb 12, 2024

⌛ Testing commit ec15d9d with merge 3d66104...

@bors
Copy link
Contributor

bors commented Feb 12, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 3d66104 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 12, 2024
@bors bors merged commit 3d66104 into rust-lang:beta Feb 12, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Feb 12, 2024
@stefson
Copy link

stefson commented Feb 12, 2024

thanks everyone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants