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

Bump hashbrown to 0.4.0 #61388

Merged
merged 1 commit into from
Jun 1, 2019
Merged

Bump hashbrown to 0.4.0 #61388

merged 1 commit into from
Jun 1, 2019

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented May 31, 2019

Fixes #61357

This also includes rust-lang/hashbrown#80.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2019
@Amanieu Amanieu mentioned this pull request May 31, 2019
Closed
@Amanieu
Copy link
Member Author

Amanieu commented May 31, 2019

This needs to be backported to beta before the 1.36 release which will include hashbrown.

@Centril Centril added beta-nominated Nominated for backporting to the compiler in the beta channel. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels May 31, 2019
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 31, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 31, 2019

📌 Commit 826c7a509e366f681a7b7a39c8f5653e36f2cb7c has been approved by alexcrichton

@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 May 31, 2019
@RalfJung RalfJung mentioned this pull request May 31, 2019
Closed
@RalfJung
Copy link
Member

RalfJung commented Jun 1, 2019

This is on the critical path to fixing Miri.

@bors p=1

@bors
Copy link
Contributor

bors commented Jun 1, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout hashbrown4 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self hashbrown4 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 1, 2019
@Amanieu
Copy link
Member Author

Amanieu commented Jun 1, 2019

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jun 1, 2019

📌 Commit a386a9e has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 1, 2019
@bors
Copy link
Contributor

bors commented Jun 1, 2019

⌛ Testing commit a386a9e with merge cd3f21b...

bors added a commit that referenced this pull request Jun 1, 2019
@bors
Auto merge of #61388 - Amanieu:hashbrown4, r=alexcrichton
cd3f21b 
Bump hashbrown to 0.4.0

Fixes #61357

This also includes rust-lang/hashbrown#80.
@bors
Copy link
Contributor

bors commented Jun 1, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing cd3f21b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 1, 2019
@bors bors merged commit a386a9e into rust-lang:master Jun 1, 2019
@bors bors mentioned this pull request Jun 1, 2019
Merged
@pietroalbini pietroalbini mentioned this pull request Jun 6, 2019
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 6, 2019
bors added a commit that referenced this pull request Jun 6, 2019
@bors
Auto merge of #61602 - pietroalbini:beta-rollup, r=pietroalbini
767967a 
[beta] Rollup backports

Rolled up:

* [beta] Permit unwinding through FFI by default #61569

Cherry-picked:

* upgrade rustdoc's `pulldown-cmark` to 0.5.2 #60802
* Fix overflowing literal lint in loops #61098
* Revert edition-guide toolstate override #61110
* Turn turbo 🐟 🍨 into an error #61189
* Bump hashbrown to 0.4.0 #61388
* Fix regression 61475 #61500

r? @ghost
bors added a commit that referenced this pull request Jun 7, 2019
@bors
Auto merge of #61602 - pietroalbini:beta-rollup, r=pietroalbini
07a9dae 
[beta] Rollup backports

Rolled up:

* [beta] Permit unwinding through FFI by default #61569

Cherry-picked:

* upgrade rustdoc's `pulldown-cmark` to 0.5.2 #60802
* Fix overflowing literal lint in loops #61098
* Revert edition-guide toolstate override #61110
* Turn turbo 🐟 🍨 into an error #61189
* Bump hashbrown to 0.4.0 #61388
* Fix regression 61475 #61500

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

hash_map::IterMut changed Send bounds with hashbrown
7 participants
@Amanieu @rust-highfive @alexcrichton @bors @RalfJung @Centril @pietroalbini