forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use default-implemented methods for IntoSystemConfig<> (#7870)

Browse Source 
# Objective

The trait `IntoSystemConfig<>` requires each implementer to repeat every single member method, even though they can all be implemented by just deferring to `SystemConfig`.

## Solution

Add default implementations to most member methods.
This commit is contained in:
JoJoJet 2023-03-02 17:19:47 +00:00
parent 9733613c07
commit 7cd2ee2bbd
1 changed files with 53 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
crates/bevy_ecs/src/schedule/config.rs
View File

@ -82,113 +82,61 @@ fn ambiguous_with(graph_info: &mut GraphInfo, set: BoxedSystemSet) {
/// Types that can be converted into a [`SystemSetConfig`]. /// Types that can be converted into a [`SystemSetConfig`].
/// ///
/// This has been implemented for all types that implement [`SystemSet`] and boxed trait objects. /// This has been implemented for all types that implement [`SystemSet`] and boxed trait objects.
pub trait IntoSystemSetConfig { pub trait IntoSystemSetConfig: Sized {
/// Convert into a [`SystemSetConfig`]. /// Convert into a [`SystemSetConfig`].
#[doc(hidden)] #[doc(hidden)]
fn into_config(self) -> SystemSetConfig; fn into_config(self) -> SystemSetConfig;
/// Add to the provided `set`. /// Add to the provided `set`.
#[track_caller] #[track_caller]
fn in_set(self, set: impl FreeSystemSet) -> SystemSetConfig; fn in_set(self, set: impl FreeSystemSet) -> SystemSetConfig {
self.into_config().in_set(set)
}
/// Add to the provided "base" `set`. For more information on base sets, see [`SystemSet::is_base`]. /// Add to the provided "base" `set`. For more information on base sets, see [`SystemSet::is_base`].
#[track_caller] #[track_caller]
fn in_base_set(self, set: impl BaseSystemSet) -> SystemSetConfig; fn in_base_set(self, set: impl BaseSystemSet) -> SystemSetConfig {
self.into_config().in_base_set(set)
}
/// Add this set to the schedules's default base set. /// Add this set to the schedules's default base set.
fn in_default_base_set(self) -> SystemSetConfig; fn in_default_base_set(self) -> SystemSetConfig {
self.into_config().in_default_base_set()
}
/// Run before all systems in `set`. /// Run before all systems in `set`.
fn before<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig; fn before<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().before(set)
}
/// Run after all systems in `set`. /// Run after all systems in `set`.
fn after<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig; fn after<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().after(set)
}
/// Run the systems in this set only if the [`Condition`] is `true`. /// Run the systems in this set only if the [`Condition`] is `true`.
/// ///
/// The `Condition` will be evaluated at most once (per schedule run), /// The `Condition` will be evaluated at most once (per schedule run),
/// the first time a system in this set prepares to run. /// the first time a system in this set prepares to run.
fn run_if<M>(self, condition: impl Condition<M>) -> SystemSetConfig; fn run_if<M>(self, condition: impl Condition<M>) -> SystemSetConfig {
self.into_config().run_if(condition)
}
/// Suppress warnings and errors that would result from systems in this set having ambiguities /// Suppress warnings and errors that would result from systems in this set having ambiguities
/// (conflicting access but indeterminate order) with systems in `set`. /// (conflicting access but indeterminate order) with systems in `set`.
fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig; fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().ambiguous_with(set)
}
/// Suppress warnings and errors that would result from systems in this set having ambiguities /// Suppress warnings and errors that would result from systems in this set having ambiguities
/// (conflicting access but indeterminate order) with any other system. /// (conflicting access but indeterminate order) with any other system.
fn ambiguous_with_all(self) -> SystemSetConfig; fn ambiguous_with_all(self) -> SystemSetConfig {
self.into_config().ambiguous_with_all()
}
} }
impl<S: SystemSet> IntoSystemSetConfig for S { impl<S: SystemSet> IntoSystemSetConfig for S {
fn into_config(self) -> SystemSetConfig { fn into_config(self) -> SystemSetConfig {
SystemSetConfig::new(Box::new(self)) SystemSetConfig::new(Box::new(self))
} }
#[track_caller]
fn in_set(self, set: impl FreeSystemSet) -> SystemSetConfig {
self.into_config().in_set(set)
}
#[track_caller]
fn in_base_set(self, set: impl BaseSystemSet) -> SystemSetConfig {
self.into_config().in_base_set(set)
}
fn in_default_base_set(self) -> SystemSetConfig {
self.into_config().in_default_base_set()
}
fn before<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().before(set)
}
fn after<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().after(set)
}
fn run_if<M>(self, condition: impl Condition<M>) -> SystemSetConfig {
self.into_config().run_if(condition)
}
fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().ambiguous_with(set)
}
fn ambiguous_with_all(self) -> SystemSetConfig {
self.into_config().ambiguous_with_all()
}
} }
impl IntoSystemSetConfig for BoxedSystemSet { impl IntoSystemSetConfig for BoxedSystemSet {
fn into_config(self) -> SystemSetConfig { fn into_config(self) -> SystemSetConfig {
SystemSetConfig::new(self) SystemSetConfig::new(self)
} }
#[track_caller]
fn in_set(self, set: impl FreeSystemSet) -> SystemSetConfig {
self.into_config().in_set(set)
}
#[track_caller]
fn in_base_set(self, set: impl BaseSystemSet) -> SystemSetConfig {
self.into_config().in_base_set(set)
}
fn in_default_base_set(self) -> SystemSetConfig {
self.into_config().in_default_base_set()
}
fn before<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().before(set)
}
fn after<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().after(set)
}
fn run_if<M>(self, condition: impl Condition<M>) -> SystemSetConfig {
self.into_config().run_if(condition)
}
fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> SystemSetConfig {
self.into_config().ambiguous_with(set)
}
fn ambiguous_with_all(self) -> SystemSetConfig {
self.into_config().ambiguous_with_all()
}
} }
impl IntoSystemSetConfig for SystemSetConfig { impl IntoSystemSetConfig for SystemSetConfig {
@ -273,33 +221,52 @@ impl IntoSystemSetConfig for SystemSetConfig {
/// ///
/// This has been implemented for boxed [`System<In=(), Out=()>`](crate::system::System) /// This has been implemented for boxed [`System<In=(), Out=()>`](crate::system::System)
/// trait objects and all functions that turn into such. /// trait objects and all functions that turn into such.
pub trait IntoSystemConfig<Marker, Config = SystemConfig> { pub trait IntoSystemConfig<Marker, Config = SystemConfig>: Sized
where
Config: IntoSystemConfig<(), Config>,
{
/// Convert into a [`SystemConfig`]. /// Convert into a [`SystemConfig`].
#[doc(hidden)] #[doc(hidden)]
fn into_config(self) -> Config; fn into_config(self) -> Config;
/// Add to `set` membership. /// Add to `set` membership.
#[track_caller] #[track_caller]
fn in_set(self, set: impl FreeSystemSet) -> Config; fn in_set(self, set: impl FreeSystemSet) -> Config {
self.into_config().in_set(set)
}
/// Add to the provided "base" `set`. For more information on base sets, see [`SystemSet::is_base`]. /// Add to the provided "base" `set`. For more information on base sets, see [`SystemSet::is_base`].
#[track_caller] #[track_caller]
fn in_base_set(self, set: impl BaseSystemSet) -> Config; fn in_base_set(self, set: impl BaseSystemSet) -> Config {
self.into_config().in_base_set(set)
}
/// Don't add this system to the schedules's default set. /// Don't add this system to the schedules's default set.
fn no_default_base_set(self) -> Config; fn no_default_base_set(self) -> Config {
self.into_config().no_default_base_set()
}
/// Run before all systems in `set`. /// Run before all systems in `set`.
fn before<M>(self, set: impl IntoSystemSet<M>) -> Config; fn before<M>(self, set: impl IntoSystemSet<M>) -> Config {
self.into_config().before(set)
}
/// Run after all systems in `set`. /// Run after all systems in `set`.
fn after<M>(self, set: impl IntoSystemSet<M>) -> Config; fn after<M>(self, set: impl IntoSystemSet<M>) -> Config {
self.into_config().after(set)
}
/// Run only if the [`Condition`] is `true`. /// Run only if the [`Condition`] is `true`.
/// ///
/// The `Condition` will be evaluated at most once (per schedule run), /// The `Condition` will be evaluated at most once (per schedule run),
/// when the system prepares to run. /// when the system prepares to run.
fn run_if<M>(self, condition: impl Condition<M>) -> Config; fn run_if<M>(self, condition: impl Condition<M>) -> Config {
self.into_config().run_if(condition)
}
/// Suppress warnings and errors that would result from this system having ambiguities /// Suppress warnings and errors that would result from this system having ambiguities
/// (conflicting access but indeterminate order) with systems in `set`. /// (conflicting access but indeterminate order) with systems in `set`.
fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> Config; fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> Config {
self.into_config().ambiguous_with(set)
}
/// Suppress warnings and errors that would result from this system having ambiguities /// Suppress warnings and errors that would result from this system having ambiguities
/// (conflicting access but indeterminate order) with any other system. /// (conflicting access but indeterminate order) with any other system.
fn ambiguous_with_all(self) -> Config; fn ambiguous_with_all(self) -> Config {
self.into_config().ambiguous_with_all()
}
} }
impl<Marker, F> IntoSystemConfig<Marker> for F impl<Marker, F> IntoSystemConfig<Marker> for F
@ -309,80 +276,12 @@ where
fn into_config(self) -> SystemConfig { fn into_config(self) -> SystemConfig {
SystemConfig::new(Box::new(IntoSystem::into_system(self))) SystemConfig::new(Box::new(IntoSystem::into_system(self)))
} }
#[track_caller]
fn in_set(self, set: impl FreeSystemSet) -> SystemConfig {
self.into_config().in_set(set)
}
#[track_caller]
fn in_base_set(self, set: impl BaseSystemSet) -> SystemConfig {
self.into_config().in_base_set(set)
}
fn no_default_base_set(self) -> SystemConfig {
self.into_config().no_default_base_set()
}
fn before<M>(self, set: impl IntoSystemSet<M>) -> SystemConfig {
self.into_config().before(set)
}
fn after<M>(self, set: impl IntoSystemSet<M>) -> SystemConfig {
self.into_config().after(set)
}
fn run_if<M>(self, condition: impl Condition<M>) -> SystemConfig {
self.into_config().run_if(condition)
}
fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> SystemConfig {
self.into_config().ambiguous_with(set)
}
fn ambiguous_with_all(self) -> SystemConfig {
self.into_config().ambiguous_with_all()
}
} }
impl IntoSystemConfig<()> for BoxedSystem<(), ()> { impl IntoSystemConfig<()> for BoxedSystem<(), ()> {
fn into_config(self) -> SystemConfig { fn into_config(self) -> SystemConfig {
SystemConfig::new(self) SystemConfig::new(self)
} }
#[track_caller]
fn in_set(self, set: impl FreeSystemSet) -> SystemConfig {
self.into_config().in_set(set)
}
#[track_caller]
fn in_base_set(self, set: impl BaseSystemSet) -> SystemConfig {
self.into_config().in_base_set(set)
}
fn no_default_base_set(self) -> SystemConfig {
self.into_config().no_default_base_set()
}
fn before<M>(self, set: impl IntoSystemSet<M>) -> SystemConfig {
self.into_config().before(set)
}
fn after<M>(self, set: impl IntoSystemSet<M>) -> SystemConfig {
self.into_config().after(set)
}
fn run_if<M>(self, condition: impl Condition<M>) -> SystemConfig {
self.into_config().run_if(condition)
}
fn ambiguous_with<M>(self, set: impl IntoSystemSet<M>) -> SystemConfig {
self.into_config().ambiguous_with(set)
}
fn ambiguous_with_all(self) -> SystemConfig {
self.into_config().ambiguous_with_all()
}
} }
impl IntoSystemConfig<()> for SystemConfig { impl IntoSystemConfig<()> for SystemConfig {