Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26646 - jdm:parking_lot, r=asajeffrey

Browse source 
Avoid parking_lot bustage with recent rustc nightlies.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #26644
- [x] There are tests for these changes
This commit is contained in:
bors-servo 2020-05-26 10:48:10 -04:00 • committed by GitHub
commit f3313739f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 20 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/msg/Cargo.toml
View file

@ -17,7 +17,7 @@ ipc-channel = "0.14"
lazy_static = "1"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
parking_lot = "0.9"
parking_lot = "0.10"
serde = "1.0.60"
servo_url = { path = "../url" }
webrender_api = { git = "https://github.com/servo/webrender" }