Implement for all label types

vladbat00 · vladbat00 · commit 646a2c982f76 · 2022-04-11T16:55:25.000+03:00
diff --git a/crates/bevy_app/src/app.rs b/crates/bevy_app/src/app.rs
@@ -864,7 +864,7 @@ impl App {
         sub_app_runner: impl Fn(&mut World, &mut App) + 'static,
     ) -> &mut Self {
         self.sub_apps.insert(
-            Box::new(label),
+            label.dyn_clone(),
             SubApp {
                 app,
                 runner: Box::new(sub_app_runner),
diff --git a/crates/bevy_ecs/src/schedule/label.rs b/crates/bevy_ecs/src/schedule/label.rs
@@ -6,12 +6,6 @@ define_label!(SystemLabel);
 define_label!(AmbiguitySetLabel);
 define_label!(RunCriteriaLabel);
 
-impl StageLabel for Box<dyn StageLabel> {
-    fn dyn_clone(&self) -> Box<dyn StageLabel> {
-        self.as_ref().dyn_clone()
-    }
-}
-
 pub(crate) type BoxedStageLabel = Box<dyn StageLabel>;
 pub(crate) type BoxedSystemLabel = Box<dyn SystemLabel>;
 pub(crate) type BoxedAmbiguitySetLabel = Box<dyn AmbiguitySetLabel>;
diff --git a/crates/bevy_ecs/src/schedule/mod.rs b/crates/bevy_ecs/src/schedule/mod.rs
@@ -111,7 +111,7 @@ impl Schedule {
     /// schedule.add_stage("my_stage", SystemStage::parallel());
     /// ```
     pub fn add_stage<S: Stage>(&mut self, label: impl StageLabel, stage: S) -> &mut Self {
-        let label: Box<dyn StageLabel> = Box::new(label);
+        let label: Box<dyn StageLabel> = label.dyn_clone();
         self.stage_order.push(label.clone());
         let prev = self.stages.insert(label.clone(), Box::new(stage));
         assert!(prev.is_none(), "Stage already exists: {:?}.", label);
@@ -135,7 +135,7 @@ impl Schedule {
         label: impl StageLabel,
         stage: S,
     ) -> &mut Self {
-        let label: Box<dyn StageLabel> = Box::new(label);
+        let label: Box<dyn StageLabel> = label.dyn_clone();
         let target = &target as &dyn StageLabel;
         let target_index = self
             .stage_order
@@ -169,7 +169,7 @@ impl Schedule {
         label: impl StageLabel,
         stage: S,
     ) -> &mut Self {
-        let label: Box<dyn StageLabel> = Box::new(label);
+        let label: Box<dyn StageLabel> = label.dyn_clone();
         let target = &target as &dyn StageLabel;
         let target_index = self
             .stage_order
diff --git a/crates/bevy_ecs/src/schedule/run_criteria.rs b/crates/bevy_ecs/src/schedule/run_criteria.rs
@@ -205,7 +205,7 @@ where
     L: RunCriteriaLabel,
 {
     fn into(self) -> RunCriteriaDescriptorOrLabel {
-        RunCriteriaDescriptorOrLabel::Label(Box::new(self))
+        RunCriteriaDescriptorOrLabel::Label(self.dyn_clone())
     }
 }
 
@@ -232,24 +232,24 @@ pub trait RunCriteriaDescriptorCoercion<Param> {
 
 impl RunCriteriaDescriptorCoercion<()> for RunCriteriaDescriptor {
     fn label(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {
-        self.label = Some(Box::new(label));
+        self.label = Some(label.dyn_clone());
         self.duplicate_label_strategy = DuplicateLabelStrategy::Panic;
         self
     }
 
     fn label_discard_if_duplicate(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {
-        self.label = Some(Box::new(label));
+        self.label = Some(label.dyn_clone());
         self.duplicate_label_strategy = DuplicateLabelStrategy::Discard;
         self
     }
 
     fn before(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {
-        self.before.push(Box::new(label));
+        self.before.push(label.dyn_clone());
         self
     }
 
     fn after(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {
-        self.after.push(Box::new(label));
+        self.after.push(label.dyn_clone());
         self
     }
 }
@@ -320,7 +320,7 @@ impl RunCriteria {
             label: None,
             duplicate_label_strategy: DuplicateLabelStrategy::Panic,
             before: vec![],
-            after: vec![Box::new(label)],
+            after: vec![label.dyn_clone()],
         }
     }
 }
diff --git a/crates/bevy_ecs/src/schedule/system_descriptor.rs b/crates/bevy_ecs/src/schedule/system_descriptor.rs
@@ -149,22 +149,22 @@ impl ParallelSystemDescriptorCoercion<()> for ParallelSystemDescriptor {
     }
 
     fn label(mut self, label: impl SystemLabel) -> ParallelSystemDescriptor {
-        self.labels.push(Box::new(label));
+        self.labels.push(label.dyn_clone());
         self
     }
 
     fn before<Marker>(mut self, label: impl AsSystemLabel<Marker>) -> ParallelSystemDescriptor {
-        self.before.push(Box::new(label.as_system_label()));
+        self.before.push(label.as_system_label().dyn_clone());
         self
     }
 
     fn after<Marker>(mut self, label: impl AsSystemLabel<Marker>) -> ParallelSystemDescriptor {
-        self.after.push(Box::new(label.as_system_label()));
+        self.after.push(label.as_system_label().dyn_clone());
         self
     }
 
     fn in_ambiguity_set(mut self, set: impl AmbiguitySetLabel) -> ParallelSystemDescriptor {
-        self.ambiguity_sets.push(Box::new(set));
+        self.ambiguity_sets.push(set.dyn_clone());
         self
     }
 }
@@ -295,22 +295,22 @@ impl ExclusiveSystemDescriptorCoercion for ExclusiveSystemDescriptor {
     }
 
     fn label(mut self, label: impl SystemLabel) -> ExclusiveSystemDescriptor {
-        self.labels.push(Box::new(label));
+        self.labels.push(label.dyn_clone());
         self
     }
 
     fn before(mut self, label: impl SystemLabel) -> ExclusiveSystemDescriptor {
-        self.before.push(Box::new(label));
+        self.before.push(label.dyn_clone());
         self
     }
 
     fn after(mut self, label: impl SystemLabel) -> ExclusiveSystemDescriptor {
-        self.after.push(Box::new(label));
+        self.after.push(label.dyn_clone());
         self
     }
 
     fn in_ambiguity_set(mut self, set: impl AmbiguitySetLabel) -> ExclusiveSystemDescriptor {
-        self.ambiguity_sets.push(Box::new(set));
+        self.ambiguity_sets.push(set.dyn_clone());
         self
     }
 
diff --git a/crates/bevy_ecs/src/schedule/system_set.rs b/crates/bevy_ecs/src/schedule/system_set.rs
@@ -90,19 +90,19 @@ impl SystemSet {
 
     #[must_use]
     pub fn label(mut self, label: impl SystemLabel) -> Self {
-        self.labels.push(Box::new(label));
+        self.labels.push(label.dyn_clone());
         self
     }
 
     #[must_use]
     pub fn before(mut self, label: impl SystemLabel) -> Self {
-        self.before.push(Box::new(label));
+        self.before.push(label.dyn_clone());
         self
     }
 
     #[must_use]
     pub fn after(mut self, label: impl SystemLabel) -> Self {
-        self.after.push(Box::new(label));
+        self.after.push(label.dyn_clone());
         self
     }
 
diff --git a/crates/bevy_ecs/src/system/function_system.rs b/crates/bevy_ecs/src/system/function_system.rs
@@ -446,7 +446,7 @@ where
         );
     }
     fn default_labels(&self) -> Vec<Box<dyn SystemLabel>> {
-        vec![Box::new(self.func.as_system_label())]
+        vec![self.func.as_system_label().dyn_clone()]
     }
 }
 
diff --git a/crates/bevy_utils/src/label.rs b/crates/bevy_utils/src/label.rs
@@ -97,5 +97,11 @@ macro_rules! define_label {
                 Box::new(<&str>::clone(self))
             }
         }
+
+        impl $label_trait_name for Box<dyn $label_trait_name> {
+            fn dyn_clone(&self) -> Self {
+                self.as_ref().dyn_clone()
+            }
+        }
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ where`
`205`	`205`	`L: RunCriteriaLabel,`
`206`	`206`	`{`
`207`	`207`	`fn into(self) -> RunCriteriaDescriptorOrLabel {`
`208`		`- RunCriteriaDescriptorOrLabel::Label(Box::new(self))`
	`208`	`+ RunCriteriaDescriptorOrLabel::Label(self.dyn_clone())`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`@@ -232,24 +232,24 @@ pub trait RunCriteriaDescriptorCoercion<Param> {`
`232`	`232`
`233`	`233`	`impl RunCriteriaDescriptorCoercion<()> for RunCriteriaDescriptor {`
`234`	`234`	`fn label(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {`
`235`		`- self.label = Some(Box::new(label));`
	`235`	`+ self.label = Some(label.dyn_clone());`
`236`	`236`	`self.duplicate_label_strategy = DuplicateLabelStrategy::Panic;`
`237`	`237`	`self`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`fn label_discard_if_duplicate(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {`
`241`		`- self.label = Some(Box::new(label));`
	`241`	`+ self.label = Some(label.dyn_clone());`
`242`	`242`	`self.duplicate_label_strategy = DuplicateLabelStrategy::Discard;`
`243`	`243`	`self`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`fn before(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {`
`247`		`- self.before.push(Box::new(label));`
	`247`	`+ self.before.push(label.dyn_clone());`
`248`	`248`	`self`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`fn after(mut self, label: impl RunCriteriaLabel) -> RunCriteriaDescriptor {`
`252`		`- self.after.push(Box::new(label));`
	`252`	`+ self.after.push(label.dyn_clone());`
`253`	`253`	`self`
`254`	`254`	`}`
`255`	`255`	`}`
`@@ -320,7 +320,7 @@ impl RunCriteria {`
`320`	`320`	`label: None,`
`321`	`321`	`duplicate_label_strategy: DuplicateLabelStrategy::Panic,`
`322`	`322`	`before: vec![],`
`323`		`- after: vec![Box::new(label)],`
	`323`	`+ after: vec![label.dyn_clone()],`
`324`	`324`	`}`
`325`	`325`	`}`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,22 +149,22 @@ impl ParallelSystemDescriptorCoercion<()> for ParallelSystemDescriptor {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`fn label(mut self, label: impl SystemLabel) -> ParallelSystemDescriptor {`
`152`		`- self.labels.push(Box::new(label));`
	`152`	`+ self.labels.push(label.dyn_clone());`
`153`	`153`	`self`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`fn before<Marker>(mut self, label: impl AsSystemLabel<Marker>) -> ParallelSystemDescriptor {`
`157`		`- self.before.push(Box::new(label.as_system_label()));`
	`157`	`+ self.before.push(label.as_system_label().dyn_clone());`
`158`	`158`	`self`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`fn after<Marker>(mut self, label: impl AsSystemLabel<Marker>) -> ParallelSystemDescriptor {`
`162`		`- self.after.push(Box::new(label.as_system_label()));`
	`162`	`+ self.after.push(label.as_system_label().dyn_clone());`
`163`	`163`	`self`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`fn in_ambiguity_set(mut self, set: impl AmbiguitySetLabel) -> ParallelSystemDescriptor {`
`167`		`- self.ambiguity_sets.push(Box::new(set));`
	`167`	`+ self.ambiguity_sets.push(set.dyn_clone());`
`168`	`168`	`self`
`169`	`169`	`}`
`170`	`170`	`}`
`@@ -295,22 +295,22 @@ impl ExclusiveSystemDescriptorCoercion for ExclusiveSystemDescriptor {`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`fn label(mut self, label: impl SystemLabel) -> ExclusiveSystemDescriptor {`
`298`		`- self.labels.push(Box::new(label));`
	`298`	`+ self.labels.push(label.dyn_clone());`
`299`	`299`	`self`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`fn before(mut self, label: impl SystemLabel) -> ExclusiveSystemDescriptor {`
`303`		`- self.before.push(Box::new(label));`
	`303`	`+ self.before.push(label.dyn_clone());`
`304`	`304`	`self`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`fn after(mut self, label: impl SystemLabel) -> ExclusiveSystemDescriptor {`
`308`		`- self.after.push(Box::new(label));`
	`308`	`+ self.after.push(label.dyn_clone());`
`309`	`309`	`self`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`fn in_ambiguity_set(mut self, set: impl AmbiguitySetLabel) -> ExclusiveSystemDescriptor {`
`313`		`- self.ambiguity_sets.push(Box::new(set));`
	`313`	`+ self.ambiguity_sets.push(set.dyn_clone());`
`314`	`314`	`self`
`315`	`315`	`}`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -90,19 +90,19 @@ impl SystemSet {`
`90`	`90`
`91`	`91`	`#[must_use]`
`92`	`92`	`pub fn label(mut self, label: impl SystemLabel) -> Self {`
`93`		`- self.labels.push(Box::new(label));`
	`93`	`+ self.labels.push(label.dyn_clone());`
`94`	`94`	`self`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`#[must_use]`
`98`	`98`	`pub fn before(mut self, label: impl SystemLabel) -> Self {`
`99`		`- self.before.push(Box::new(label));`
	`99`	`+ self.before.push(label.dyn_clone());`
`100`	`100`	`self`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`#[must_use]`
`104`	`104`	`pub fn after(mut self, label: impl SystemLabel) -> Self {`
`105`		`- self.after.push(Box::new(label));`
	`105`	`+ self.after.push(label.dyn_clone());`
`106`	`106`	`self`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ where`
`446`	`446`	`);`
`447`	`447`	`}`
`448`	`448`	`fn default_labels(&self) -> Vec<Box<dyn SystemLabel>> {`
`449`		`- vec![Box::new(self.func.as_system_label())]`
	`449`	`+ vec![self.func.as_system_label().dyn_clone()]`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`
Original file line number	Diff line number	Diff line change
`@@ -97,5 +97,11 @@ macro_rules! define_label {`
`97`	`97`	`Box::new(<&str>::clone(self))`
`98`	`98`	`}`
`99`	`99`	`}`
	`100`	`+`
	`101`	`+ impl $label_trait_name for Box<dyn $label_trait_name> {`
	`102`	`+ fn dyn_clone(&self) -> Self {`
	`103`	`+ self.as_ref().dyn_clone()`
	`104`	`+ }`
	`105`	`+ }`
`100`	`106`	`};`
`101`	`107`	`}`