Skip to content

Commit 54cd232

Browse files
committed
Merge branch 'main' into flatten-render-commands
2 parents 5efcff3 + bad3d57 commit 54cd232

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

crates/bevy_tasks/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ async-executor = "1.3.0"
1414
async-channel = "1.4.2"
1515
async-task = "4.2.0"
1616
once_cell = "1.7"
17-
concurrent-queue = "1.2.2"
17+
concurrent-queue = "2.0.0"
1818

1919
[target.'cfg(target_arch = "wasm32")'.dependencies]
2020
wasm-bindgen-futures = "0.4"

deny.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,10 @@ wildcards = "deny"
3434
highlight = "all"
3535
# Certain crates/versions that will be skipped when doing duplicate detection.
3636
skip = [
37-
{ name = "miniz_oxide", version = "0.5" }, # from image v0.24.4
3837
{ name = "ndk-sys", version = "0.3" }, # from rodio v0.16.0
3938
{ name = "ndk", version = "0.6" }, # from rodio v0.16.0
4039
{ name = "raw-window-handle", version = "0.4" }, # from winit v0.27.4
4140
{ name = "nix", version = "0.23" }, # from cpal v0.14.1
42-
{ name = "nix", version = "0.24" }, # from cpal v0.14.1
43-
{ name = "bare-metal", version = "0.2" }, # from postcard v1.0.2
44-
{ name = "nb", version = "0.1" }, # from postcard v1.0.2
4541
{ name = "rustc_version", version = "0.2" }, # from postcard v1.0.2
4642
{ name = "semver", version = "0.9" }, # from postcard v1.0.2
4743
{ name = "windows_aarch64_msvc", version = "0.36" }, # from notify v5.0.0
@@ -50,6 +46,7 @@ skip = [
5046
{ name = "windows_x86_64_gnu", version = "0.36" }, # from notify v5.0.0
5147
{ name = "windows_x86_64_msvc", version = "0.36" }, # from notify v5.0.0
5248
{ name = "windows-sys", version = "0.36" }, # from notify v5.0.0
49+
{ name = "windows", version = "0.37" }, # from rodio v0.16.0
5350
{ name = "windows_aarch64_msvc", version = "0.37" }, # from rodio v0.16.0
5451
{ name = "windows_i686_gnu", version = "0.37" }, # from rodio v0.16.0
5552
{ name = "windows_i686_msvc", version = "0.37" }, # from rodio v0.16.0

0 commit comments

Comments
 (0)