Merge pull request #156 from Speak2Erase/update-flume

Update flume to 0.11.1

.gitignore

@@ -1,15 +1,10 @@
 #! Rust Build Output
 /target
-/marshal/target
-/crates/launcher/dist
+dist/
 
 #! GDB-related files
 .gdb_*
 
-#! Ruby Output Files
-/marshal_ruby
-/marshal_luminol
-
 #! conventional commits config
 git-conventional-commits.yaml
 

Cargo.toml

@@ -139,7 +139,7 @@ dashmap = "5.5.3" # More efficient replacement of the HashMap structure
 futures-lite = "2.1.0" # Lightweight, more safe replacement of 'futures'
 
 # * Tools to aid concurrent programming * #
-flume = "0.11.0"       # Fast multi-producer, multi-consumer channel
+flume = "0.11.1"       # Fast multi-producer, multi-consumer channel
 oneshot = "0.1.6"      # Oneshot single-producer, single-consumer channels
 async-std = "1.12.0"   # Asynchronous version of the Rust Standard Library
 fragile = "2.0"        # Provides wrapper types for sending non-Send values to other threads
@@ -219,12 +219,6 @@ opt-level = 3
 # See why config is set up this way.
 # https://bevy-cheatbook.github.io/pitfalls/performance.html#why-not-use---release
 
-[patch.crates-io]
-# flume's global spinlock uses `thread::sleep` which doesn't work in the main thread in WebAssembly.
-# This is a patched version with `thread::sleep` removed in WebAssembly builds.
-# See https://github.com/zesterer/flume/issues/137.
-flume = { git = "https://github.com/Astrabit-ST/flume", rev = "d323799efea329c87a3a5a5b45cc76f46da278c2" }
-
 # If you want to use the bleeding edge version of egui and eframe:
 # egui = { git = "https://github.com/emilk/egui", branch = "master" }
 # eframe = { git = "https://github.com/emilk/egui", branch = "master" }

crates/launcher/Cargo.toml

@@ -80,6 +80,11 @@ luminol-term.workspace = true
 # * Misc. * #
 steamworks = { version = "0.10.0", optional = true } # Bindings to the Steamworks API
 
+# Enable the spin feature on web, because we can't block the main thread (see https://github.com/zesterer/flume/issues/137)
+[target.'cfg(target_arch = "wasm32")'.dependencies.flume]
+workspace = true
+features = ["spin"]
+
 # Set poll promise features here based on the target
 # I'd much rather do it in the workspace, but cargo doesn't support that yet
 #