Skip to content

Commit

Permalink
Update parking_lot.
Browse files Browse the repository at this point in the history
There's this pending glutin PR:

  rust-windowing/glutin#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.
  • Loading branch information
emilio committed May 3, 2022
1 parent 6fadbde commit 20e9a87
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 18 deletions.
92 changes: 79 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion wgpu-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 = "0.12"

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
console_error_panic_hook = "0.1.6"
Expand Down

0 comments on commit 20e9a87

Please sign in to comment.