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] master -> beta promotion for 1.37 #62332

Merged
merged 3 commits into from
Jul 4, 2019
Merged

[beta] master -> beta promotion for 1.37 #62332

merged 3 commits into from
Jul 4, 2019

Conversation

Mark-Simulacrum
Copy link
Member

This includes the release note patch from stable.

r? @pietroalbini

@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 3, 2019
@Mark-Simulacrum
Copy link
Member Author

#62304 is not included in this PR; it will go through the normal beta-nomination/acceptance process.

@pietroalbini
Copy link
Member

#62304 is not included in this PR; it will go through the normal beta-nomination/acceptance process.

What's the reason for this? We basically have to backport it to beta anyway since it's on stable now.

@Mark-Simulacrum
Copy link
Member Author

I'm not confident that we'll want the exact same patch for beta; at least @eddyb seemed uncertain on the PR. I can include it and we can revert/re-apply a different patch later on if you'd like me to.

@pietroalbini
Copy link
Member

pietroalbini commented Jul 3, 2019 •
edited
Loading

It would be nice to include it. r=me otherwise.

@SimonSapin @Mark-Simulacrum
HashMap is UnwindSafe
421160e 
Fixes rust-lang#62301, a regression in 1.36.0 which was caused by hashbrown using `NonZero<T>` where the older hashmap used `Unique<T>`.
@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Jul 3, 2019

📌 Commit 421160e has been approved by pietroalbini

@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 3, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors p=1

@bors
Copy link
Contributor

bors commented Jul 4, 2019

⌛ Testing commit 421160e with merge 32998df894eb913c6e0157ee8a86d4f59beb1504...

@Centril
Copy link
Contributor

Centril commented Jul 4, 2019

@bors retry yielding r0llup to trim queue.

@bors
Copy link
Contributor

bors commented Jul 4, 2019

⌛ Testing commit 421160e with merge 64dfd0f99ed7df6171cef3d11790f47e4e920fc2...

@Centril
Copy link
Contributor

Centril commented Jul 4, 2019

@bors retry yielding r0llup to trim queue.

@bors
Copy link
Contributor

bors commented Jul 4, 2019

⌛ Testing commit 421160e with merge 178aa66...

bors added a commit that referenced this pull request Jul 4, 2019
@bors
Auto merge of #62332 - Mark-Simulacrum:beta-next, r=pietroalbini
178aa66 
[beta] master -> beta promotion for 1.37

This includes the release note patch from stable.

r? @pietroalbini
@bors
Copy link
Contributor

bors commented Jul 4, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: pietroalbini
Pushing 178aa66 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 4, 2019
@bors bors merged commit 421160e into rust-lang:beta Jul 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

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
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Mark-Simulacrum @rust-highfive @pietroalbini @bors @Centril @SimonSapin