Merge branch 'main' into skip-empty

crates/bevy_ecs/src/query/iter.rs

@@ -151,20 +151,11 @@ where
     #[inline(always)]
     fn next(&mut self) -> Option<Self::Item> {
         unsafe {
-            if QF::IS_DENSE && <QueryFetch<'static, F>>::IS_DENSE {
-                loop {
-                    if self.current_index == self.current_len {
-                        let table_id = self.table_id_iter.next()?;
-                        let table = &self.tables[*table_id];
-                        if table.is_empty() {
-                            continue;
-                        }
-
-                        self.fetch.set_table(&self.query_state.fetch_state, table);
-                        self.filter.set_table(&self.query_state.filter_state, table);
-                        self.current_len = table.len();
-                        self.current_index = 0;
-                    }
+            for entity in self.entity_iter.by_ref() {
+                let location = match self.entities.get(*entity.borrow()) {
+                    Some(location) => location,
+                    None => continue,
+                };
 
                 if !self
                     .query_state
@@ -173,28 +164,6 @@ where
                 {
                     continue;
                 }
-            } else {
-                loop {
-                    if self.current_index == self.current_len {
-                        let archetype_id = self.archetype_id_iter.next()?;
-                        let archetype = &self.archetypes[*archetype_id];
-                        if archetype.is_empty() {
-                            continue;
-                        }
-
-                        self.fetch.set_archetype(
-                            &self.query_state.fetch_state,
-                            archetype,
-                            self.tables,
-                        );
-                        self.filter.set_archetype(
-                            &self.query_state.filter_state,
-                            archetype,
-                            self.tables,
-                        );
-                        self.current_len = archetype.len();
-                        self.current_index = 0;
-                    }
 
                 let archetype = &self.archetypes[location.archetype_id];