Run cargo fmt and cargo clippy

bevyengine · Jun 27, 2022 · 5c4d486 · 5c4d486
1 parent 5ac9021
commit 5c4d486
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/crates/bevy_ecs/src/world/archetype_invariants.rs b/crates/bevy_ecs/src/world/archetype_invariants.rs
@@ -98,7 +98,9 @@ impl<B: Bundle> ArchetypeStatement<B> {
                 }
                 UntypedArchetypeStatement::AtLeastOneOf(component_ids)
             }
-            ArchetypeStatement::AtMostOneOf(_) => UntypedArchetypeStatement::AtMostOneOf(component_ids),
+            ArchetypeStatement::AtMostOneOf(_) => {
+                UntypedArchetypeStatement::AtMostOneOf(component_ids)
+            }
             ArchetypeStatement::NoneOf(_) => UntypedArchetypeStatement::NoneOf(component_ids),
         }
     }
@@ -129,7 +131,7 @@ impl<B: Bundle> ArchetypeStatement<B> {
 }
 
 /// A type-erased version of [`ArchetypeInvariant`].
-/// 
+///
 /// Intended to be used with dynamic components that cannot be represented with Rust types.
 /// Prefer [`ArchetypeInvariant`] when possible.
 #[derive(Clone, Debug, PartialEq)]
@@ -215,10 +217,9 @@ impl UntypedArchetypeStatement {
                 for exclusive_id in exclusive_ids {
                     if component_ids.contains(exclusive_id) {
                         if found_previous {
-                            return false
-                        } else {
-                            found_previous = true;
+                            return false;
                         }
+                        found_previous = true;
                     }
                 }
                 true

diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs
@@ -663,7 +663,7 @@ impl World {
         archetype_invariant: ArchetypeInvariant<B1, B2>,
     ) {
         let untyped_invariant = archetype_invariant.into_untyped(self);
-        
+
         for archetype in &self.archetypes.archetypes {
             let components = archetype.components.indices();
             untyped_invariant.test_archetype(components);