add as_interior_mutable(&mut self), as_interior_mutable_readonly(&self) and temporary migration method

Author: jakobhellermann

crates/bevy_ecs/src/system/query.rs

@@ -1182,7 +1182,7 @@ impl<'w, 's, Q: WorldQuery, F: ReadOnlyWorldQuery> Query<'w, 's, Q, F> {
         }
         let world = self.world;
         let entity_ref = world
-            .as_interior_mutable()
+            .as_interior_mutable_migration_internal()
             .get_entity(entity)
             .ok_or(QueryComponentError::NoSuchEntity)?;
         let component_id = world

crates/bevy_ecs/src/system/system_param.rs

@@ -536,7 +536,7 @@ unsafe impl<'a, T: Resource> SystemParam for ResMut<'a, T> {
         change_tick: u32,
     ) -> Self::Item<'w, 's> {
         let value = world
-            .as_interior_mutable()
+            .as_interior_mutable_migration_internal()
             .get_resource_mut_with_id(component_id)
             .unwrap_or_else(|| {
                 panic!(
@@ -574,7 +574,7 @@ unsafe impl<'a, T: Resource> SystemParam for Option<ResMut<'a, T>> {
         change_tick: u32,
     ) -> Self::Item<'w, 's> {
         world
-            .as_interior_mutable()
+            .as_interior_mutable_migration_internal()
             .get_resource_mut_with_id(component_id)
             .map(|value| ResMut {
                 value: value.value,

crates/bevy_ecs/src/world/mod.rs

@@ -105,7 +105,19 @@ impl World {
         self.id
     }
 
-    pub fn as_interior_mutable(&self) -> InteriorMutableWorld<'_> {
+    /// Creates a new [`InteriorMutableWorld`] view with complete read+write access
+    pub fn as_interior_mutable(&mut self) -> InteriorMutableWorld<'_> {
+        InteriorMutableWorld::new(self)
+    }
+    /// Creates a new [`InteriorMutableWorld`] view only read access to everything
+    pub fn as_interior_mutable_readonly(&self) -> InteriorMutableWorld<'_> {
+        InteriorMutableWorld::new(self)
+    }
+
+    /// Creates a new [`InteriorMutableWorld`] with read+write access from a [&World](World).
+    /// This is only a temporary measure until every `&World` that is semantically a [InteriorMutableWorld]
+    /// has been replaced.
+    pub(crate) fn as_interior_mutable_migration_internal(&self) -> InteriorMutableWorld<'_> {
         InteriorMutableWorld::new(self)
     }
 

crates/bevy_ecs/src/world/world_cell.rs

@@ -228,7 +228,7 @@ impl<'w> WorldCell<'w> {
             // SAFETY: ComponentId matches TypeId and access is checked by WorldBorrowMut
             || unsafe {
                 self.world
-                    .as_interior_mutable()
+                    .as_interior_mutable_migration_internal()
                     .get_resource_mut_with_id(component_id)
             },
             archetype_component_id,
@@ -298,7 +298,7 @@ impl<'w> WorldCell<'w> {
             // SAFETY: access is checked by WorldBorrowMut
             || unsafe {
                 self.world
-                    .as_interior_mutable()
+                    .as_interior_mutable_migration_internal()
                     .get_non_send_resource_mut::<T>()
             },
             archetype_component_id,