Implement for all label types

Author: vladbat00

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),

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>;

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

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()],
         }
     }
 }

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
     }
 

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
     }
 

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()]
     }
 }
 

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()
+            }
+        }
     };
 }