Make things compatible with branch

Author: TheRawMeatball

crates/bevy_ecs/src/ptr.rs

@@ -99,6 +99,10 @@ macro_rules! impl_ptr {
 
 impl_ptr!(Ptr);
 impl<'a> Ptr<'a> {
+    pub fn inner(self) -> NonNull<u8> {
+        self.0
+    }
+
     /// # Safety
     /// another PtrMut for the same Ptr shouldn't be created until the first is dropped.
     pub unsafe fn assert_unique(self) -> PtrMut<'a> {

crates/bevy_ecs/src/query/fetch.rs

@@ -336,7 +336,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
                 let column = tables[archetype.table_id()]
                     .get_column(state.component_id)
                     .unwrap();
-                self.table_components = column.get_data_ptr().inner_nonnull().cast::<T>();
+                self.table_components = column.get_data_ptr().inner().cast::<T>();
             }
             StorageType::SparseSet => self.entities = archetype.entities().as_ptr(),
         }
@@ -348,7 +348,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
             .get_column(state.component_id)
             .unwrap()
             .get_data_ptr()
-            .inner_nonnull()
+            .inner()
             .cast::<T>();
     }
 
@@ -364,7 +364,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
                 &*(*self.sparse_set)
                     .get(entity)
                     .unwrap()
-                    .inner_nonnull()
+                    .inner()
                     .cast::<T>()
                     .as_ptr()
             }
@@ -502,7 +502,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
                 let column = tables[archetype.table_id()]
                     .get_column(state.component_id)
                     .unwrap();
-                self.table_components = column.get_data_ptr().inner_nonnull().cast::<T>();
+                self.table_components = column.get_data_ptr().inner().cast::<T>();
                 self.table_ticks = column.get_ticks_ptr();
             }
             StorageType::SparseSet => self.entities = archetype.entities().as_ptr(),
@@ -512,7 +512,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
     #[inline]
     unsafe fn set_table(&mut self, state: &Self::State, table: &Table) {
         let column = table.get_column(state.component_id).unwrap();
-        self.table_components = column.get_data_ptr().inner_nonnull().cast::<T>();
+        self.table_components = column.get_data_ptr().inner().cast::<T>();
         self.table_ticks = column.get_ticks_ptr();
     }
 
@@ -535,7 +535,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
                 let (component, component_ticks) =
                     (*self.sparse_set).get_with_ticks(entity).unwrap();
                 Mut {
-                    value: &mut *component.inner_nonnull().cast::<T>().as_ptr(),
+                    value: &mut *component.inner().cast::<T>().as_ptr(),
                     ticks: Ticks {
                         component_ticks: &mut *component_ticks.get(),
                         change_tick: self.change_tick,
@@ -862,7 +862,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
                 let column = tables[archetype.table_id()]
                     .get_column(state.component_id)
                     .unwrap();
-                self.table_ticks = column.get_ticks_const_ptr();
+                self.table_ticks = column.get_ticks_ptr() as *const _;
             }
             StorageType::SparseSet => self.entities = archetype.entities().as_ptr(),
         }
@@ -873,7 +873,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
         self.table_ticks = table
             .get_column(state.component_id)
             .unwrap()
-            .get_ticks_const_ptr();
+            .get_ticks_ptr() as *const _;
     }
 
     #[inline]