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

remove Box from ExclusiveSystemFn (#3063)

Browse Source 
Minor refactor to remove the boxing of the function pointer stored in ExclusiveSystemFn.
This commit is contained in:
Marc Parenteau 2021-11-04 20:55:28 +00:00
parent 91c3b210a2
commit 225d6a138f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_ecs/src/schedule/system_descriptor.rs
View File

@ -78,7 +78,10 @@ impl IntoSystemDescriptor<()> for ExclusiveSystemDescriptor {
} }
} }
impl IntoSystemDescriptor<()> for ExclusiveSystemFn { impl<F> IntoSystemDescriptor<()> for ExclusiveSystemFn<F>
where
F: FnMut(&mut crate::prelude::World) + Send + Sync + 'static,
{
fn into_descriptor(self) -> SystemDescriptor { fn into_descriptor(self) -> SystemDescriptor {
new_exclusive_descriptor(Box::new(self)).into_descriptor() new_exclusive_descriptor(Box::new(self)).into_descriptor()
} }

15
crates/bevy_ecs/src/system/exclusive_system.rs
View File

@ -15,13 +15,16 @@ pub trait ExclusiveSystem: Send + Sync + 'static {
fn check_change_tick(&mut self, change_tick: u32); fn check_change_tick(&mut self, change_tick: u32);
} }
pub struct ExclusiveSystemFn { pub struct ExclusiveSystemFn<F> {
func: Box<dyn FnMut(&mut World) + Send + Sync + 'static>, func: F,
name: Cow<'static, str>, name: Cow<'static, str>,
last_change_tick: u32, last_change_tick: u32,
} }
impl ExclusiveSystem for ExclusiveSystemFn { impl<F> ExclusiveSystem for ExclusiveSystemFn<F>
where
F: FnMut(&mut World) + Send + Sync + 'static,
{
fn name(&self) -> Cow<'static, str> { fn name(&self) -> Cow<'static, str> {
self.name.clone() self.name.clone()
} }
@ -52,13 +55,13 @@ pub trait IntoExclusiveSystem<Params, SystemType> {
fn exclusive_system(self) -> SystemType; fn exclusive_system(self) -> SystemType;
} }
impl<F> IntoExclusiveSystem<&mut World, ExclusiveSystemFn> for F impl<F> IntoExclusiveSystem<&mut World, ExclusiveSystemFn<F>> for F
where where
F: FnMut(&mut World) + Send + Sync + 'static, F: FnMut(&mut World) + Send + Sync + 'static,
{ {
fn exclusive_system(self) -> ExclusiveSystemFn { fn exclusive_system(self) -> ExclusiveSystemFn<F> {
ExclusiveSystemFn { ExclusiveSystemFn {
func: Box::new(self), func: self,
name: core::any::type_name::<F>().into(), name: core::any::type_name::<F>().into(),
last_change_tick: 0, last_change_tick: 0,
} }