Skip to content

Update parking_lot dependencies #50269

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Apr 27, 2018
Merged

Conversation

alexcrichton
Copy link
Member

This commit updates parking_lot to pull in Amanieu/parking_lot#70 and...

Closes #49438

This commit updates `parking_lot` to pull in Amanieu/parking_lot#70 and...

Closes rust-lang#49438
@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(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 Apr 27, 2018
@Mark-Simulacrum
Copy link
Member

@bors r+

Does this need a beta backport?

@bors
Copy link
Collaborator

bors commented Apr 27, 2018

📌 Commit 3565556 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 Apr 27, 2018
@alexcrichton
Copy link
Member Author

I believe #50254 should be good enough for beta, so I don't think we need to backport this

@alexcrichton
Copy link
Member Author

@bors: rollup

kennytm added a commit to kennytm/rust that referenced this pull request Apr 27, 2018
…Mark-Simulacrum

Update `parking_lot` dependencies

This commit updates `parking_lot` to pull in Amanieu/parking_lot#70 and...

Closes rust-lang#49438
bors added a commit that referenced this pull request Apr 27, 2018
Rollup of 9 pull requests

Successful merges:

 - #49858 (std: Mark `ptr::Unique` with `#[doc(hidden)]`)
 - #49968 (Stabilize dyn trait)
 - #50192 (Add some utilities to `libsyntax`)
 - #50251 (rustc: Disable threads in LLD for wasm)
 - #50263 (rustc: Emit `uwtable` for allocator shims)
 - #50269 (Update `parking_lot` dependencies)
 - #50273 (Allow #[inline] on closures)
 - #50284 (fix search load page failure)
 - #50257 (Don't ICE on tuple struct ctor with incorrect arg count)

Failed merges:
@bors bors merged commit 3565556 into rust-lang:master Apr 27, 2018
@alexcrichton alexcrichton deleted the update-parking-lot branch May 10, 2018 19:19
# for free to join this conversation on GitHub. Already have an account? # 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