Implement From<bool> for ShouldRun. (bevyengine#5306)

Make writing simple yes/no run criteria easier. Co-authored-by: devil-ira <justthecooldude@gmail.com>
james7132 · Oct 28, 2022 · 9646694 · 9646694
1 parent 47d9137
commit 9646694
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/benches/benches/bevy_ecs/scheduling/run_criteria.rs b/benches/benches/bevy_ecs/scheduling/run_criteria.rs
@@ -147,12 +147,7 @@ pub fn run_criteria_yes_with_query(criterion: &mut Criterion) {
     group.measurement_time(std::time::Duration::from_secs(3));
     fn empty() {}
     fn yes_with_query(query: Query<&TestBool>) -> ShouldRun {
-        let test_bool = query.single();
-        if test_bool.0 {
-            ShouldRun::Yes
-        } else {
-            ShouldRun::No
-        }
+        query.single().0.into()
     }
     for amount in 0..21 {
         let mut stage = SystemStage::parallel();
@@ -184,11 +179,7 @@ pub fn run_criteria_yes_with_resource(criterion: &mut Criterion) {
     group.measurement_time(std::time::Duration::from_secs(3));
     fn empty() {}
     fn yes_with_resource(res: Res<TestBool>) -> ShouldRun {
-        if res.0 {
-            ShouldRun::Yes
-        } else {
-            ShouldRun::No
-        }
+        res.0.into()
     }
     for amount in 0..21 {
         let mut stage = SystemStage::parallel();

diff --git a/crates/bevy_ecs/src/schedule/run_criteria.rs b/crates/bevy_ecs/src/schedule/run_criteria.rs
@@ -56,6 +56,16 @@ impl ShouldRun {
     }
 }
 
+impl From<bool> for ShouldRun {
+    fn from(value: bool) -> Self {
+        if value {
+            ShouldRun::Yes
+        } else {
+            ShouldRun::No
+        }
+    }
+}
+
 #[derive(Default)]
 pub(crate) struct BoxedRunCriteria {
     criteria_system: Option<BoxedSystem<(), ShouldRun>>,

diff --git a/examples/ecs/system_sets.rs b/examples/ecs/system_sets.rs
@@ -104,11 +104,7 @@ fn run_for_a_second(time: Res<Time>, mut done: ResMut<Done>) -> ShouldRun {
 
 /// Another run criteria, simply using a resource.
 fn is_done(done: Res<Done>) -> ShouldRun {
-    if done.0 {
-        ShouldRun::Yes
-    } else {
-        ShouldRun::No
-    }
+    done.0.into()
 }
 
 /// Used with [`RunCritera::pipe`], inverts the result of the