From fadb23a319ffee8179b3e3426091f008867b982e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= <torokati44@gmail.com>
Date: Wed, 19 Jun 2024 23:03:21 +0200
Subject: [PATCH 1/3] chore: Update `wgpu-core` and `wgpu-hal` to 0.21.1

---
 Cargo.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79a592d78691..eca441470233 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1188,7 +1188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
 dependencies = [
  "bitflags 2.5.0",
- "libloading 0.7.4",
+ "libloading 0.8.4",
  "winapi",
 ]
 
@@ -1431,7 +1431,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.7.4",
+ "libloading 0.8.4",
 ]
 
 [[package]]
@@ -2389,7 +2389,7 @@ dependencies = [
  "bitflags 2.5.0",
  "com",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.4",
  "thiserror",
  "widestring",
  "winapi",
@@ -6325,9 +6325,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59e0d5fc509601c69e4e1fa06c1eb3c4c9f12956a5e30c79b61ef1c1be7daf0"
+checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
 dependencies = [
  "arrayvec",
  "bit-vec",
@@ -6354,9 +6354,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa24c3889f885a3fb9133b454c8418bfcfaadcfe4ed3be96ac80e76703b863b"
+checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -6376,7 +6376,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.4",
  "log",
  "metal",
  "naga",

From 4df6079272a77b1330b98de774eaa2d08262e03e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= <torokati44@gmail.com>
Date: Wed, 19 Jun 2024 20:55:13 +0200
Subject: [PATCH 2/3] Revert "ci: Release and test with Rust 1.78 instead of
 stable"

This reverts commit 4448e37d98eead7915d6e963b3b272e001d4cff7.
---
 .github/workflows/release_nightly.yml | 4 +---
 .github/workflows/test_rust.yml       | 8 ++------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index c42a5387adfb..813221368a54 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -108,9 +108,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          # TODO: Return to latest "stable" once this is released:
-          # https://github.com/gfx-rs/wgpu/pull/5831 (probably in wgpu 0.20.2)
-          toolchain: "1.78"
+          toolchain: stable
           targets: ${{ matrix.target }}
 
       - name: Install Linux dependencies
diff --git a/.github/workflows/test_rust.yml b/.github/workflows/test_rust.yml
index 00982e161a93..65f65d4cd352 100644
--- a/.github/workflows/test_rust.yml
+++ b/.github/workflows/test_rust.yml
@@ -38,9 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: Return to latest "stable" once this is released:
-        # https://github.com/gfx-rs/wgpu/pull/5831 (probably in wgpu 0.20.2)
-        rust_version: ["1.78"]
+        rust_version: [stable]
         os: [ubuntu-22.04, windows-latest, macos-14]
         include:
           - rust_version: nightly
@@ -182,9 +180,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # TODO: Return to latest "stable" once this is released:
-        # https://github.com/gfx-rs/wgpu/pull/5831 (probably in wgpu 0.20.2)
-        rust_version: ["1.78"]
+        rust_version: [stable]
         os: [ubuntu-22.04, windows-latest, macos-14]
         include:
           - rust_version: nightly

From e2bc3e8679dadef177b60b6fb0cd68ff7bd01ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= <torokati44@gmail.com>
Date: Wed, 19 Jun 2024 23:05:47 +0200
Subject: [PATCH 3/3] chore: Bump bitstream-io to 2.4.2

---
 Cargo.lock      | 4 ++--
 core/Cargo.toml | 2 +-
 swf/Cargo.toml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eca441470233..f5a6e7b8bf8f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -521,9 +521,9 @@ dependencies = [
 
 [[package]]
 name = "bitstream-io"
-version = "2.3.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
+checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8"
 
 [[package]]
 name = "block"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 458cf4a7cad6..f636864df07c 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
 [dependencies]
 linkme = { version = "0.3", optional = true }
 byteorder = "1.5"
-bitstream-io = "2.3.0"
+bitstream-io = "2.4.2"
 flate2 = { workspace = true }
 fnv = "1.0.7"
 gc-arena = { package = "ruffle_gc_arena", path = "../ruffle_gc_arena" }
diff --git a/swf/Cargo.toml b/swf/Cargo.toml
index 1a9e0760f036..d1b92f4def21 100644
--- a/swf/Cargo.toml
+++ b/swf/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 bitflags = { workspace = true }
-bitstream-io = "2.3.0"
+bitstream-io = "2.4.2"
 byteorder = "1.5"
 encoding_rs = "0.8.34"
 num-derive = { workspace = true }