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

Backport #85834 and #86368 #87393

Merged
merged 6 commits into from
Jul 23, 2021
Merged

Backport #85834 and #86368 #87393

merged 6 commits into from
Jul 23, 2021

Conversation

michaelwoerister
Copy link
Member

As per discussion in https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/backport.20.2386368, backporting #85834 too seems like the safest option for cleanly backporting #86368.

r? @Mark-Simulacrum

@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 Jul 23, 2021
@michaelwoerister michaelwoerister mentioned this pull request Jul 23, 2021
Merged
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never p=1

I've unilaterally accepted #85834 for backport for now so we can get this going.

@bors
Copy link
Contributor

bors commented Jul 23, 2021

📌 Commit 741e208 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 Jul 23, 2021
@bors
Copy link
Contributor

bors commented Jul 23, 2021

⌛ Testing commit 741e208 with merge c8fb0b5...

@bors
Copy link
Contributor

bors commented Jul 23, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2021
@bors bors merged commit c8fb0b5 into rust-lang:beta Jul 23, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jul 23, 2021
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.
Projects
None yet
Milestone
1.54.0
Development

Successfully merging this pull request may close these issues.
6 participants
@michaelwoerister @rust-highfive @Mark-Simulacrum @bors @rustbot @cjgillot