refactor: use bevy-style scopes

Author: NthTensor

rayon-compat/src/lib.rs

@@ -83,19 +83,19 @@ where
 pub use forte::Scope;
 
 #[inline(always)]
-pub fn scope<'scope, OP, R>(op: OP) -> R
+pub fn scope<OP, R>(op: OP) -> Option<R>
 where
-    OP: FnOnce(&Scope<'scope>) -> R + Send,
+    OP: for<'scope> FnOnce(&'scope Scope<'scope, '_>) -> R + Send,
     R: Send,
 {
     ensure_started();
     forte::scope(op)
 }
 
 #[inline(always)]
-pub fn in_place_scope<'scope, OP, R>(op: OP) -> R
+pub fn in_place_scope<OP, R>(op: OP) -> Option<R>
 where
-    OP: FnOnce(&Scope<'scope>) -> R,
+    OP: for<'scope> FnOnce(&'scope Scope<'scope, '_>) -> R,
 {
     ensure_started();
     forte::scope(op)

src/lib.rs

@@ -73,6 +73,7 @@ mod platform {
     pub use alloc::sync::Arc;
     pub use alloc::sync::Weak;
     pub use core::sync::atomic::AtomicBool;
+    pub use core::sync::atomic::AtomicPtr;
     pub use core::sync::atomic::AtomicU32;
     pub use core::sync::atomic::Ordering;
     pub use std::sync::Barrier;
@@ -95,6 +96,7 @@ mod platform {
     pub use shuttle::sync::Mutex;
     pub use shuttle::sync::Weak;
     pub use shuttle::sync::atomic::AtomicBool;
+    pub use shuttle::sync::atomic::AtomicPtr;
     pub use shuttle::sync::atomic::AtomicU32;
     pub use shuttle::sync::atomic::Ordering;
     pub use shuttle::thread::Builder as ThreadBuilder;