diff options
| author | bors-servo <servo-ops@mozilla.com> | 2020-05-26 10:48:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 10:48:10 -0400 |
| commit | f3313739f576cc5ca955e20743db524114a8f799 (patch) | |
| tree | c9cdd6e25cd0585a0b08db2093397fad4411601e /components/msg | |
| parent | 70c43b7a5c47fab15668ce257df292b8f01323c9 (diff) | |
| parent | 1da40b59af3b4f4b10dd5c04bc786ba577c2fa58 (diff) | |
| download | servo-f3313739f576cc5ca955e20743db524114a8f799.tar.gz servo-f3313739f576cc5ca955e20743db524114a8f799.zip | |
Auto merge of #26646 - jdm:parking_lot, r=asajeffrey
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
Diffstat (limited to 'components/msg')
| -rw-r--r-- | components/msg/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index ebcb26accee..771ca53feb9 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -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" } |