
# 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>
156 lines
4.9 KiB
Rust
156 lines
4.9 KiB
Rust
use crate::{
|
|
prelude::{FromWorld, QueryState},
|
|
query::{QueryData, QueryFilter},
|
|
system::{Local, SystemMeta, SystemParam, SystemState},
|
|
world::World,
|
|
};
|
|
use bevy_utils::{all_tuples, synccell::SyncCell};
|
|
use core::marker::PhantomData;
|
|
|
|
/// A parameter that can be used in an exclusive system (a system with an `&mut World` parameter).
|
|
/// Any parameters implementing this trait must come after the `&mut World` parameter.
|
|
#[diagnostic::on_unimplemented(
|
|
message = "`{Self}` can not be used as a parameter for an exclusive system",
|
|
label = "invalid system parameter"
|
|
)]
|
|
pub trait ExclusiveSystemParam: Sized {
|
|
/// Used to store data which persists across invocations of a system.
|
|
type State: Send + Sync + 'static;
|
|
/// The item type returned when constructing this system param.
|
|
/// See [`SystemParam::Item`].
|
|
type Item<'s>: ExclusiveSystemParam<State = Self::State>;
|
|
|
|
/// Creates a new instance of this param's [`State`](Self::State).
|
|
fn init(world: &mut World, system_meta: &mut SystemMeta) -> Self::State;
|
|
|
|
/// Creates a parameter to be passed into an [`ExclusiveSystemParamFunction`].
|
|
///
|
|
/// [`ExclusiveSystemParamFunction`]: super::ExclusiveSystemParamFunction
|
|
fn get_param<'s>(state: &'s mut Self::State, system_meta: &SystemMeta) -> Self::Item<'s>;
|
|
}
|
|
|
|
/// Shorthand way of accessing the associated type [`ExclusiveSystemParam::Item`]
|
|
/// for a given [`ExclusiveSystemParam`].
|
|
pub type ExclusiveSystemParamItem<'s, P> = <P as ExclusiveSystemParam>::Item<'s>;
|
|
|
|
impl<'a, D: QueryData + 'static, F: QueryFilter + 'static> ExclusiveSystemParam
|
|
for &'a mut QueryState<D, F>
|
|
{
|
|
type State = QueryState<D, F>;
|
|
type Item<'s> = &'s mut QueryState<D, F>;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
QueryState::new(world)
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
state
|
|
}
|
|
}
|
|
|
|
impl<'a, P: SystemParam + 'static> ExclusiveSystemParam for &'a mut SystemState<P> {
|
|
type State = SystemState<P>;
|
|
type Item<'s> = &'s mut SystemState<P>;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
SystemState::new(world)
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
state
|
|
}
|
|
}
|
|
|
|
impl<'_s, T: FromWorld + Send + 'static> ExclusiveSystemParam for Local<'_s, T> {
|
|
type State = SyncCell<T>;
|
|
type Item<'s> = Local<'s, T>;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
SyncCell::new(T::from_world(world))
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
Local(state.get())
|
|
}
|
|
}
|
|
|
|
impl<S: ?Sized> ExclusiveSystemParam for PhantomData<S> {
|
|
type State = ();
|
|
type Item<'s> = PhantomData<S>;
|
|
|
|
fn init(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
|
|
|
|
fn get_param<'s>(_state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
PhantomData
|
|
}
|
|
}
|
|
|
|
macro_rules! impl_exclusive_system_param_tuple {
|
|
($(#[$meta:meta])* $($param: ident),*) => {
|
|
#[allow(unused_variables)]
|
|
#[allow(non_snake_case)]
|
|
$(#[$meta])*
|
|
impl<$($param: ExclusiveSystemParam),*> ExclusiveSystemParam for ($($param,)*) {
|
|
type State = ($($param::State,)*);
|
|
type Item<'s> = ($($param::Item<'s>,)*);
|
|
|
|
#[inline]
|
|
fn init(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
(($($param::init(_world, _system_meta),)*))
|
|
}
|
|
|
|
#[inline]
|
|
#[allow(clippy::unused_unit)]
|
|
fn get_param<'s>(
|
|
state: &'s mut Self::State,
|
|
system_meta: &SystemMeta,
|
|
) -> Self::Item<'s> {
|
|
|
|
let ($($param,)*) = state;
|
|
($($param::get_param($param, system_meta),)*)
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
all_tuples!(
|
|
#[doc(fake_variadic)]
|
|
impl_exclusive_system_param_tuple,
|
|
0,
|
|
16,
|
|
P
|
|
);
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate as bevy_ecs;
|
|
use crate::{schedule::Schedule, system::Local, world::World};
|
|
use bevy_ecs_macros::Resource;
|
|
use core::marker::PhantomData;
|
|
|
|
#[test]
|
|
fn test_exclusive_system_params() {
|
|
#[derive(Resource, Default)]
|
|
struct Res {
|
|
test_value: u32,
|
|
}
|
|
|
|
fn my_system(world: &mut World, mut local: Local<u32>, _phantom: PhantomData<Vec<u32>>) {
|
|
assert_eq!(world.resource::<Res>().test_value, *local);
|
|
*local += 1;
|
|
world.resource_mut::<Res>().test_value += 1;
|
|
}
|
|
|
|
let mut schedule = Schedule::default();
|
|
schedule.add_systems(my_system);
|
|
|
|
let mut world = World::default();
|
|
world.init_resource::<Res>();
|
|
|
|
schedule.run(&mut world);
|
|
schedule.run(&mut world);
|
|
|
|
assert_eq!(2, world.get_resource::<Res>().unwrap().test_value);
|
|
}
|
|
}
|