Skip to content

1.44.1 stable backports#8350

Merged
bors merged 3 commits into
rust-lang:rust-1.44.1from
Mark-Simulacrum:rust-1.44.1
Jun 11, 2020
Merged

1.44.1 stable backports#8350
bors merged 3 commits into
rust-lang:rust-1.44.1from
Mark-Simulacrum:rust-1.44.1

Conversation

@Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum commented Jun 11, 2020

Copy link
Copy Markdown
Member

Tried to duplicate #8335, though had to manually adjust 3b9e8dc4c1dc6a6ec714acb6a97b4f7cffda1176 (cherry-pick of #8329) as it had a merge conflict.

Stable backports for:

@rust-highfive

Copy link
Copy Markdown

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.44.1. 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 Jun 11, 2020
@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

(Do we also need to bump the Cargo version or so? Let me know.)

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

Hm not sure what's up with the test failures, maybe I broke something?

@alexcrichton

Copy link
Copy Markdown
Member

This can happen since nightly features periodically break. I don't think anything is wrong at this time, and those failures look pretty benign. We could merge this as failing (which seems fine by me) or the change that fixed this in Cargo could get hunted down and cherry-picked here too

@Mark-Simulacrum Mark-Simulacrum force-pushed the rust-1.44.1 branch 2 times, most recently from d41fcac to 4e2f1ba Compare June 11, 2020 15:04
@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

Okay I tried cherry-picking a fix but that didn't seem to fix the tests fully so I've dropped it now. I'm fine with merging with tests not passing, I agree they look benign.

@alexcrichton

Copy link
Copy Markdown
Member

Mind deleting the tests in question and then this should be r+'able?

@ehuss

ehuss commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

I'm pretty sure this should not include #8290. That regression only applied to beta.

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

@ehuss -- dropped #8290. I had included it per Zulip message but I guess I probably misunderstood.

@ehuss

ehuss commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

Ah, sorry for the confusion, I hadn't looked at the exact PR # in zulip.

As for the version number, I am ambivalent. If you want to publish a new version, that would be fine. But it probably isn't too important, and this will get picked up in the next release next month anyways.

r=me if everyone is ready.

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

Seems good to issue a new release, and will give us another run at publish.py -- I bumped to 0.45.1 as I believe there's no API breakage involved in this PR. Can you confirm I don't need to bump any other crates?

@ehuss

ehuss commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

I don't think any other crates need to be changed.

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

@bors r=ehuss then, thanks!

@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

📌 Commit 56d6aad has been approved by ehuss

@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 Jun 11, 2020
@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

⌛ Testing commit 56d6aad with merge 88ba857...

@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 88ba857 to rust-1.44.1...

@bors bors merged commit 88ba857 into rust-lang:rust-1.44.1 Jun 11, 2020
@ehuss ehuss added this to the 1.44.1 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants