concurrent-queue

Author: bushrat011899

crates/bevy_tasks/Cargo.toml

@@ -18,6 +18,7 @@ std = [
   "slab/std",
   "fastrand/std",
   "spin/std",
+  "concurrent-queue/std",
 ]
 
 [dependencies]
@@ -30,8 +31,9 @@ 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" }
+concurrent-queue = { version = "2.0.0", default-features = false }
 
 bevy_utils = { path = "../bevy_utils", version = "0.15.0-dev", default-features = false }
 

crates/bevy_tasks/src/global_task_pool.rs

@@ -1,4 +1,4 @@
-use alloc::sync::Arc;
+use alloc::{string::String, sync::Arc, vec::Vec};
 use core::{cell::RefCell, future::Future, marker::PhantomData, mem};
 
 use spin::RwLock;

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, \