Merge branch 'main' into reinsert-drop

crates/bevy_ecs/src/query/fetch.rs

@@ -531,9 +531,11 @@ impl<'w, T: Component> Fetch<'w> for WriteFetch<T> {
                 let table_row = *self.entity_table_rows.add(archetype_index);
                 Mut {
                     value: &mut *self.table_components.as_ptr().add(table_row),
-                    component_ticks: &mut *(&*self.table_ticks.add(table_row)).get(),
-                    change_tick: self.change_tick,
-                    last_change_tick: self.last_change_tick,
+                    ticks: Ticks {
+                        component_ticks: &mut *(&*self.table_ticks.add(table_row)).get(),
+                        change_tick: self.change_tick,
+                        last_change_tick: self.last_change_tick,
+                    },
                 }
             }
             StorageType::SparseSet => {
@@ -556,9 +558,11 @@ impl<'w, T: Component> Fetch<'w> for WriteFetch<T> {
     unsafe fn table_fetch(&mut self, table_row: usize) -> Self::Item {
         Mut {
             value: &mut *self.table_components.as_ptr().add(table_row),
-            component_ticks: &mut *(&*self.table_ticks.add(table_row)).get(),
-            change_tick: self.change_tick,
-            last_change_tick: self.last_change_tick,
+            ticks: Ticks {
+                component_ticks: &mut *(&*self.table_ticks.add(table_row)).get(),
+                change_tick: self.change_tick,
+                last_change_tick: self.last_change_tick,
+            },
         }
     }
 }

crates/bevy_ecs/src/world/mod.rs

@@ -752,9 +752,11 @@ impl World {
         let column = self.get_populated_resource_column(component_id)?;
         Some(Mut {
             value: &mut *column.get_data_ptr().cast::<T>().as_ptr(),
-            component_ticks: &mut *column.get_ticks_mut_ptr_unchecked(0),
-            last_change_tick: self.last_change_tick(),
-            change_tick: self.read_change_tick(),
+            ticks: Ticks {
+                component_ticks: &mut *column.get_ticks_mut_ptr_unchecked(0),
+                last_change_tick: self.last_change_tick(),
+                change_tick: self.read_change_tick(),
+            },
         })
     }