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.

Sign up for GitHub

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

Jump to bottom

[beta] backports + bootstrap bump #95061

Merged
merged 4 commits into from
Mar 18, 2022
Merged

[beta] backports + bootstrap bump #95061

merged 4 commits into from
Mar 18, 2022

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 18, 2022 •
edited
Loading

Add pending backports:

And updates the bootstrap compiler to 1.59.0.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ 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!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 18, 2022
@Mark-Simulacrum
Copy link
Member

Mind pulling in the beta-backports, so we bundle the CI cycle into just one? Looks like there should be two: https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3Abeta-accepted+label%3Abeta-nominated

oli-obk and others added 2 commits March 17, 2022 18:26
@oli-obk @cuviper
Revert accidental stabilization
ac796ac 
(cherry picked from commit 5f7ca55)
@estebank @cuviper
Do not recover from Ty? in macro parsing
8dad22d 
Follow up to rust-lang#92746. Address rust-lang#94510.

(cherry picked from commit 004f2ed)
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 18, 2022
@cuviper
Copy link
Member Author

cuviper commented Mar 18, 2022

Ok, I've added the two backports.

@Mark-Simulacrum Mark-Simulacrum changed the title [beta] Update the bootstrap compiler to 1.59.0 [beta] backports + bootstrap bump Mar 18, 2022
@Mark-Simulacrum
Copy link
Member

Thanks!

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Mar 18, 2022

📌 Commit 8dad22d has been approved by Mark-Simulacrum

@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 Mar 18, 2022
@bors
Copy link
Contributor

bors commented Mar 18, 2022

⌛ Testing commit 8dad22d with merge 04bf33fd6168c266113ee1cc58e9a25485d1bea3...

@bors
Copy link
Contributor

bors commented Mar 18, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 18, 2022
@slanterns
Copy link
Contributor

Seems #95050 should also be included?

@ehuss @cuviper
Fix cmake build.
113631b 
(cherry picked from commit 8322cdb)
@cuviper
Copy link
Member Author

cuviper commented Mar 18, 2022

Thanks @slanterns, I added it.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Mar 18, 2022

📌 Commit 113631b has been approved by Mark-Simulacrum

@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 Mar 18, 2022
@bors
Copy link
Contributor

bors commented Mar 18, 2022

⌛ Testing commit 113631b with merge 6ee5a40...

@bors
Copy link
Contributor

bors commented Mar 18, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 18, 2022
@bors bors merged commit 6ee5a40 into rust-lang:beta Mar 18, 2022
@rustbot rustbot added this to the 1.60.0 milestone Mar 18, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Apr 1, 2022
Closed
@cuviper cuviper deleted the beta-stage0 branch April 12, 2022 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.
9 participants
@cuviper @rust-highfive @Mark-Simulacrum @bors @slanterns @rustbot @oli-obk @estebank @ehuss