Rebased on staging, fixed additionnal warnings

bevyengine · May 10, 2022 · 1ad1b3d · 1ad1b3d
1 parent e3db345
commit 1ad1b3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/crates/bevy_app/src/plugin_group.rs b/crates/bevy_app/src/plugin_group.rs
@@ -173,7 +173,7 @@ mod tests {
                 std::any::TypeId::of::<PluginB>(),
                 std::any::TypeId::of::<PluginC>(),
             ]
-        )
+        );
     }
 
     #[test]
@@ -190,7 +190,7 @@ mod tests {
                 std::any::TypeId::of::<PluginC>(),
                 std::any::TypeId::of::<PluginB>(),
             ]
-        )
+        );
     }
 
     #[test]
@@ -207,7 +207,7 @@ mod tests {
                 std::any::TypeId::of::<PluginC>(),
                 std::any::TypeId::of::<PluginB>(),
             ]
-        )
+        );
     }
 
     #[test]
@@ -225,7 +225,7 @@ mod tests {
                 std::any::TypeId::of::<PluginC>(),
                 std::any::TypeId::of::<PluginB>(),
             ]
-        )
+        );
     }
 
     #[test]
@@ -243,7 +243,7 @@ mod tests {
                 std::any::TypeId::of::<PluginC>(),
                 std::any::TypeId::of::<PluginB>(),
             ]
-        )
+        );
     }
 
     #[test]
@@ -261,6 +261,6 @@ mod tests {
                 std::any::TypeId::of::<PluginC>(),
                 std::any::TypeId::of::<PluginB>(),
             ]
-        )
+        );
     }
 }
diff --git a/crates/bevy_ecs/src/query/access.rs b/crates/bevy_ecs/src/query/access.rs
@@ -268,12 +268,11 @@ impl<T: SparseSetIndex> FilteredAccessSet<T> {
     pub fn is_compatible(&self, other: &FilteredAccessSet<T>) -> bool {
         if self.combined_access.is_compatible(other.combined_access()) {
             return true;
-        } else {
-            for filtered in self.filtered_accesses.iter() {
-                for other_filtered in other.filtered_accesses.iter() {
-                    if !filtered.is_compatible(other_filtered) {
-                        return false;
-                    }
+        }
+        for filtered in &self.filtered_accesses {
+            for other_filtered in &other.filtered_accesses {
+                if !filtered.is_compatible(other_filtered) {
+                    return false;
                 }
             }
         }
@@ -286,8 +285,8 @@ impl<T: SparseSetIndex> FilteredAccessSet<T> {
         // if the unfiltered access is incompatible, must check each pair
         let mut conflicts = HashSet::new();
         if !self.combined_access.is_compatible(other.combined_access()) {
-            for filtered in self.filtered_accesses.iter() {
-                for other_filtered in other.filtered_accesses.iter() {
+            for filtered in &self.filtered_accesses {
+                for other_filtered in &other.filtered_accesses {
                     conflicts.extend(filtered.get_conflicts(other_filtered).into_iter());
                 }
             }
@@ -300,7 +299,7 @@ impl<T: SparseSetIndex> FilteredAccessSet<T> {
         // if the unfiltered access is incompatible, must check each pair
         let mut conflicts = HashSet::new();
         if !self.combined_access.is_compatible(filtered_access.access()) {
-            for filtered in self.filtered_accesses.iter() {
+            for filtered in &self.filtered_accesses {
                 conflicts.extend(filtered.get_conflicts(filtered_access).into_iter());
             }
         }