From c608d48b265806958ebb26dc29f1fd7f6fe32006 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 25 Oct 2023 05:47:25 +0000
Subject: [PATCH] fix(deps): update rust dependencies to v2

---
 Cargo.lock         | 98 +++++++++++++++++++++++++++++++++++++++-------
 core/Cargo.toml    |  2 +-
 desktop/Cargo.toml |  4 +-
 tests/Cargo.toml   |  2 +-
 web/Cargo.toml     |  2 +-
 5 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d9be00f306f37..83a8693a240b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -273,10 +273,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
+[[package]]
+name = "async-channel"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "336d835910fab747186c56586562cb46f42809c2843ef3a84f47509009522838"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 3.0.0",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -290,20 +303,40 @@ dependencies = [
  "futures-lite",
  "log",
  "parking",
- "polling",
+ "polling 2.8.0",
  "rustix 0.37.23",
  "slab",
  "socket2",
  "waker-fn",
 ]
 
+[[package]]
+name = "async-io"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8557f564c11bb72e6e82e80c2cf2b9d8377e45919597bcabf1945f8bd1759916"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling 3.2.0",
+ "rustix 0.38.13",
+ "slab",
+ "tracing",
+ "waker-fn",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "async-lock"
 version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
 ]
 
 [[package]]
@@ -312,7 +345,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
 dependencies = [
- "async-io",
+ "async-io 1.13.0",
  "autocfg",
  "blocking",
  "futures-lite",
@@ -465,7 +498,7 @@ version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-lock",
  "async-task",
  "atomic-waker",
@@ -1517,6 +1550,27 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "event-listener"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160"
+dependencies = [
+ "event-listener 3.0.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "exporter"
 version = "0.1.0"
@@ -2403,19 +2457,19 @@ version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "castaway",
  "crossbeam-utils",
  "curl",
  "curl-sys",
  "encoding_rs",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-lite",
  "http",
  "log",
  "mime",
  "once_cell",
- "polling",
+ "polling 2.8.0",
  "slab",
  "sluice",
  "tracing",
@@ -3535,6 +3589,20 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "polling"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix 0.38.13",
+ "tracing",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.4.3"
@@ -3845,7 +3913,7 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f"
 dependencies = [
- "async-io",
+ "async-io 1.13.0",
  "block",
  "dispatch",
  "futures-util",
@@ -3886,7 +3954,7 @@ dependencies = [
 name = "ruffle_core"
 version = "0.1.0"
 dependencies = [
- "async-channel",
+ "async-channel 2.0.0",
  "bitflags 2.4.0",
  "bitstream-io",
  "build_playerglobal",
@@ -3945,8 +4013,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "arboard",
- "async-channel",
- "async-io",
+ "async-channel 2.0.0",
+ "async-io 2.0.0",
  "async-net",
  "bytemuck",
  "chrono",
@@ -4154,7 +4222,7 @@ dependencies = [
 name = "ruffle_web"
 version = "0.1.0"
 dependencies = [
- "async-channel",
+ "async-channel 2.0.0",
  "base64",
  "chrono",
  "console_error_panic_hook",
@@ -4488,7 +4556,7 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "futures-core",
  "futures-io",
 ]
@@ -4760,7 +4828,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "approx",
- "async-channel",
+ "async-channel 2.0.0",
  "env_logger",
  "futures",
  "image",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index e88ee817d657b..11673a9992317 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -55,7 +55,7 @@ egui = { workspace = true, optional = true }
 egui_extras = { git = "https://github.com/torokati44/egui", branch = "wgpu-0.17-arc", optional = true }
 png = { version = "0.17.10", optional = true }
 flv-rs = { path = "../flv" }
-async-channel = "1.9.0"
+async-channel = "2.0.0"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies.futures]
 version = "0.3.28"
diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml
index e1650e11fc865..1ed3abf80941d 100644
--- a/desktop/Cargo.toml
+++ b/desktop/Cargo.toml
@@ -38,9 +38,9 @@ futures = "0.3.28"
 chrono = { version = "0.4", default-features = false, features = [] }
 fluent-templates = "0.8.0"
 futures-lite = "1.13.0"
-async-io = "1.13.0"
+async-io = "2.0.0"
 async-net = "1.7.0"
-async-channel = "1.9.0"
+async-channel = "2.0.0"
 
 # Deliberately held back to match tracy client used by profiling crate
 tracing-tracy = { version = "=0.10.2", optional = true }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index d32c45becb75f..d109d4966d2d5 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -37,7 +37,7 @@ toml = "0.7.6"
 libtest-mimic = "0.6.1"
 walkdir = "2.3.3"
 anyhow = "1.0.75"
-async-channel = "1.9.0"
+async-channel = "2.0.0"
 
 [[test]]
 name = "tests"
diff --git a/web/Cargo.toml b/web/Cargo.toml
index 1be36875ee3a7..ce2b069af1f9b 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -49,7 +49,7 @@ getrandom = { version = "0.2", features = ["js"] }
 serde = { version = "1.0.188", features = ["derive"] }
 thiserror = "1.0"
 base64 = "0.21.3"
-async-channel = "1.9.0"
+async-channel = "2.0.0"
 
 [dependencies.ruffle_core]
 path = "../core"