From 3bfe3a52b582cfcf5b42b61ca06e761dddcbbafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 3 May 2022 05:58:53 +0200 Subject: [PATCH] Update parking_lot. There's this pending glutin PR: https://github.com/rust-windowing/glutin/pull/1402 And winit, which has already updated but hasn't done a new release yet. But I'm interested in updating these in Firefox, where we don't use these, so this patch as-is would still be useful. --- Cargo.lock | 92 +++++++++++++++++++++++++++++++++++++------- wgpu-core/Cargo.toml | 2 +- wgpu-hal/Cargo.toml | 2 +- wgpu/Cargo.toml | 5 +-- 4 files changed, 83 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 962fcb1de58..c31e77b2ba0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,9 +92,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -691,7 +691,7 @@ dependencies = [ "log", "objc", "osmesa-sys", - "parking_lot", + "parking_lot 0.11.2", "wayland-client", "wayland-egl", "winapi", @@ -930,10 +930,11 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] @@ -1234,7 +1235,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.3", ] [[package]] @@ -1251,6 +1262,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "percent-encoding" version = "2.1.0" @@ -2069,7 +2093,7 @@ dependencies = [ "naga", "noise", "obj", - "parking_lot", + "parking_lot 0.12.0", "png", "pollster", "rand 0.7.3", @@ -2097,7 +2121,7 @@ dependencies = [ "fxhash", "log", "naga", - "parking_lot", + "parking_lot 0.12.0", "profiling", "raw-window-handle", "ron", @@ -2134,7 +2158,7 @@ dependencies = [ "metal", "naga", "objc", - "parking_lot", + "parking_lot 0.12.0", "profiling", "range-alloc", "raw-window-handle", @@ -2195,14 +2219,56 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winit" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70466a5f4825cc88c92963591b06dbc255420bffe19d847bfcda475e82d079c0" +checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" dependencies = [ "bitflags", - "block", "cocoa", "core-foundation 0.9.1", "core-graphics 0.22.2", @@ -2217,7 +2283,7 @@ dependencies = [ "ndk-glue", "ndk-sys", "objc", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding", "raw-window-handle", "smithay-client-toolkit", diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index cafa3d5436c..24f99ec24db 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -30,7 +30,7 @@ codespan-reporting = "0.11" copyless = "0.1" fxhash = "0.2" log = "0.4" -parking_lot = "0.11" +parking_lot = "0.12" profiling = { version = "1", default-features = false } raw-window-handle = { version = "0.4", optional = true } ron = { version = "0.7", optional = true } diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 529fc4f174e..cfc5d9d3feb 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -31,7 +31,7 @@ required-features = ["gles"] [dependencies] bitflags = "1.0" -parking_lot = "0.11" +parking_lot = "0.12" profiling = { version = "1", default-features = false } raw-window-handle = "0.4" thiserror = "1" diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 404c72a9d5d..8120b05ea81 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -112,7 +112,7 @@ version = "0.12" [dependencies] arrayvec = "0.7" log = "0.4" -parking_lot = "0.11" +parking_lot = "0.12" raw-window-handle = "0.4" serde = { version = "1", features = ["derive"], optional = true } smallvec = "1" @@ -283,8 +283,7 @@ web-sys = { version = "0.3.53", features = [ ]} js-sys = "0.3.50" wasm-bindgen-futures = "0.4.23" -# enable parking_lot's wasm-bindgen feature so that it, in turn, enables that of crate `instant` -parking_lot = { version = "0.11", features = ["wasm-bindgen"] } +parking_lot = { version = "0.12" } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] console_error_panic_hook = "0.1.6"