Merge branch 'NoSTDBevyTasks' of https://github.com/bushrat011899/bevy …

…into NoSTDBevyTasks
bevyengine · Sep 23, 2024 · 2f345b3 · 2f345b3
2 parents eee356d + 8bda189
commit 2f345b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/crates/bevy_tasks/Cargo.toml b/crates/bevy_tasks/Cargo.toml
@@ -30,6 +30,7 @@ fastrand = { version = "2.0.0", default-features = false }
 spin = { version = "0.9.8", default-features = false, features = [
   "spin_mutex",
   "rwlock",
+  "once",
 ] }
 concurrent-queue = { version = "2.0.0" }
 

diff --git a/crates/bevy_tasks/src/global_task_pool.rs b/crates/bevy_tasks/src/global_task_pool.rs
@@ -1,4 +1,4 @@
-use alloc::sync::Arc;
+use alloc::{vec::Vec, sync::Arc, string::String};
 use core::{cell::RefCell, future::Future, marker::PhantomData, mem};
 
 use spin::RwLock;

diff --git a/crates/bevy_tasks/src/usages.rs b/crates/bevy_tasks/src/usages.rs
@@ -1,10 +1,10 @@
 use super::TaskPool;
 use core::ops::Deref;
-use std::sync::OnceLock;
+use spin::Once;
 
 macro_rules! taskpool {
     ($(#[$attr:meta])* ($static:ident, $type:ident)) => {
-        static $static: OnceLock<$type> = OnceLock::new();
+        static $static: Once<$type> = Once::new();
 
         $(#[$attr])*
         #[derive(Debug)]
@@ -13,7 +13,7 @@ macro_rules! taskpool {
         impl $type {
             #[doc = concat!(" Gets the global [`", stringify!($type), "`] instance, or initializes it with `f`.")]
             pub fn get_or_init(f: impl FnOnce() -> TaskPool) -> &'static Self {
-                $static.get_or_init(|| Self(f()))
+                $static.call_once(|| Self(f()))
             }
 
             #[doc = concat!(" Attempts to get the global [`", stringify!($type), "`] instance, \