replace lazy-static

frewsxcv · Nov 24, 2023 · a0ca035 · a0ca035
1 parent b3fb2f9
commit a0ca035
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rgis-network/Cargo.toml b/rgis-network/Cargo.toml
@@ -16,7 +16,6 @@ bevy = { version = "0.12", default-features = false, features = [
 ] }
 bytes = "1"
 futures-util = "0.3"
-lazy_static = "1"
 
 reqwest = { version = "0.11", features = ["stream"] }
 

diff --git a/rgis-network/src/lib.rs b/rgis-network/src/lib.rs
@@ -7,17 +7,10 @@
 )]
 
 use futures_util::StreamExt;
-use std::io;
+use std::{io, sync};
 
 #[cfg(not(target_arch = "wasm32"))]
-lazy_static::lazy_static! {
-    pub static ref TOKIO_RUNTIME: tokio::runtime::Runtime = {
-        tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .unwrap()
-    };
-}
+const TOKIO_RUNTIME: sync::OnceLock<tokio::runtime::Runtime> = sync::OnceLock::new();
 
 pub struct FetchedFile {
     pub name: String,
@@ -98,7 +91,14 @@ async fn await_future<Output>(
 ) -> Output {
     #[cfg(not(target_arch = "wasm32"))]
     {
-        TOKIO_RUNTIME.block_on(future)
+        TOKIO_RUNTIME
+            .get_or_init(|| {
+                tokio::runtime::Builder::new_multi_thread()
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            })
+            .block_on(future)
     }
     #[cfg(target_arch = "wasm32")]
     {