 d70595b667
			
		
	
	
		d70595b667
		
			
		
	
	
	
	
		
			
			# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
		
			
				
	
	
		
			107 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			107 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use super::TaskPool;
 | |
| use core::ops::Deref;
 | |
| use std::sync::OnceLock;
 | |
| 
 | |
| macro_rules! taskpool {
 | |
|     ($(#[$attr:meta])* ($static:ident, $type:ident)) => {
 | |
|         static $static: OnceLock<$type> = OnceLock::new();
 | |
| 
 | |
|         $(#[$attr])*
 | |
|         #[derive(Debug)]
 | |
|         pub struct $type(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()))
 | |
|             }
 | |
| 
 | |
|             #[doc = concat!(" Attempts to get the global [`", stringify!($type), "`] instance, \
 | |
|                 or returns `None` if it is not initialized.")]
 | |
|             pub fn try_get() -> Option<&'static Self> {
 | |
|                 $static.get()
 | |
|             }
 | |
| 
 | |
|             #[doc = concat!(" Gets the global [`", stringify!($type), "`] instance.")]
 | |
|             #[doc = ""]
 | |
|             #[doc = " # Panics"]
 | |
|             #[doc = " Panics if the global instance has not been initialized yet."]
 | |
|             pub fn get() -> &'static Self {
 | |
|                 $static.get().expect(
 | |
|                     concat!(
 | |
|                         "The ",
 | |
|                         stringify!($type),
 | |
|                         " has not been initialized yet. Please call ",
 | |
|                         stringify!($type),
 | |
|                         "::get_or_init beforehand."
 | |
|                     )
 | |
|                 )
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         impl Deref for $type {
 | |
|             type Target = TaskPool;
 | |
| 
 | |
|             fn deref(&self) -> &Self::Target {
 | |
|                 &self.0
 | |
|             }
 | |
|         }
 | |
|     };
 | |
| }
 | |
| 
 | |
| taskpool! {
 | |
|     /// A newtype for a task pool for CPU-intensive work that must be completed to
 | |
|     /// deliver the next frame
 | |
|     ///
 | |
|     /// See [`TaskPool`] documentation for details on Bevy tasks.
 | |
|     /// [`AsyncComputeTaskPool`] should be preferred if the work does not have to be
 | |
|     /// completed before the next frame.
 | |
|     (COMPUTE_TASK_POOL, ComputeTaskPool)
 | |
| }
 | |
| 
 | |
| taskpool! {
 | |
|     /// A newtype for a task pool for CPU-intensive work that may span across multiple frames
 | |
|     ///
 | |
|     /// See [`TaskPool`] documentation for details on Bevy tasks.
 | |
|     /// Use [`ComputeTaskPool`] if the work must be complete before advancing to the next frame.
 | |
|     (ASYNC_COMPUTE_TASK_POOL, AsyncComputeTaskPool)
 | |
| }
 | |
| 
 | |
| taskpool! {
 | |
|     /// A newtype for a task pool for IO-intensive work (i.e. tasks that spend very little time in a
 | |
|     /// "woken" state)
 | |
|     ///
 | |
|     /// See [`TaskPool`] documentation for details on Bevy tasks.
 | |
|     (IO_TASK_POOL, IoTaskPool)
 | |
| }
 | |
| 
 | |
| /// A function used by `bevy_core` to tick the global tasks pools on the main thread.
 | |
| /// This will run a maximum of 100 local tasks per executor per call to this function.
 | |
| ///
 | |
| /// # Warning
 | |
| ///
 | |
| /// This function *must* be called on the main thread, or the task pools will not be updated appropriately.
 | |
| #[cfg(not(target_arch = "wasm32"))]
 | |
| pub fn tick_global_task_pools_on_main_thread() {
 | |
|     COMPUTE_TASK_POOL
 | |
|         .get()
 | |
|         .unwrap()
 | |
|         .with_local_executor(|compute_local_executor| {
 | |
|             ASYNC_COMPUTE_TASK_POOL
 | |
|                 .get()
 | |
|                 .unwrap()
 | |
|                 .with_local_executor(|async_local_executor| {
 | |
|                     IO_TASK_POOL
 | |
|                         .get()
 | |
|                         .unwrap()
 | |
|                         .with_local_executor(|io_local_executor| {
 | |
|                             for _ in 0..100 {
 | |
|                                 compute_local_executor.try_tick();
 | |
|                                 async_local_executor.try_tick();
 | |
|                                 io_local_executor.try_tick();
 | |
|                             }
 | |
|                         });
 | |
|                 });
 | |
|         });
 | |
| }
 |