Remove WorldCell

crates/bevy_audio/src/audio_output.rs

@@ -1,6 +1,6 @@
 use crate::{Audio, AudioSource, Decodable};
 use bevy_asset::{Asset, Assets};
-use bevy_ecs::world::World;
+use bevy_ecs::system::{NonSend, Res, ResMut};
 use bevy_utils::tracing::warn;
 use rodio::{OutputStream, OutputStreamHandle, Sink};
 use std::marker::PhantomData;
@@ -67,15 +67,14 @@ where
 }
 
 /// Plays audio currently queued in the [`Audio`] resource through the [`AudioOutput`] resource
-pub fn play_queued_audio_system<Source: Asset>(world: &mut World)
-where
+pub fn play_queued_audio_system<Source: Asset>(
+    audio_output: NonSend<AudioOutput<Source>>,
+    mut audio: ResMut<Audio<Source>>,
+    audio_assets: Option<Res<Assets<Source>>>,
+) where
     Source: Decodable,
 {
-    let world = world.cell();
-    let audio_output = world.get_non_send::<AudioOutput<Source>>().unwrap();
-    let mut audio = world.get_resource_mut::<Audio<Source>>().unwrap();
-
-    if let Some(audio_sources) = world.get_resource::<Assets<Source>>() {
+    if let Some(audio_sources) = audio_assets {
         audio_output.try_play_queued(&*audio_sources, &mut *audio);
     };
 }

crates/bevy_ecs/src/world/mod.rs

@@ -1,11 +1,9 @@
 mod entity_ref;
 mod spawn_batch;
-mod world_cell;
 
 pub use crate::change_detection::Mut;
 pub use entity_ref::*;
 pub use spawn_batch::*;
-pub use world_cell::*;
 
 use crate::{
     archetype::{ArchetypeComponentId, ArchetypeComponentInfo, ArchetypeId, Archetypes},
@@ -77,8 +75,6 @@ pub struct World {
     pub(crate) storages: Storages,
     pub(crate) bundles: Bundles,
     pub(crate) removed_components: SparseSet<ComponentId, Vec<Entity>>,
-    /// Access cache used by [WorldCell].
-    pub(crate) archetype_component_access: ArchetypeComponentAccess,
     main_thread_validator: MainThreadValidator,
     pub(crate) change_tick: AtomicU32,
     pub(crate) last_change_tick: u32,
@@ -94,7 +90,6 @@ impl Default for World {
             storages: Default::default(),
             bundles: Default::default(),
             removed_components: Default::default(),
-            archetype_component_access: Default::default(),
             main_thread_validator: Default::default(),
             // Default value is `1`, and `last_change_tick`s default to `0`, such that changes
             // are detected on first system runs and for direct world queries.
@@ -164,13 +159,6 @@ impl World {
         &self.bundles
     }
 
-    /// Retrieves a [`WorldCell`], which safely enables multiple mutable World accesses at the same
-    /// time, provided those accesses do not conflict with each other.
-    #[inline]
-    pub fn cell(&mut self) -> WorldCell<'_> {
-        WorldCell::new(self)
-    }
-
     pub fn init_component<T: Component>(&mut self) -> ComponentId {
         self.components.init_component::<T>(&mut self.storages)
     }