nits

Author: BoxyUwU

crates/bevy_ecs/src/world/unsafe_world_cell.rs

@@ -87,17 +87,15 @@ impl<'w> UnsafeWorldCell<'w> {
     pub(crate) fn new_mutable(world: &'w mut World) -> Self {
         // SAFETY: raw pointer is derived from an `&mut World` and `Unsafecell<World>` has
         //         the same layout as `World`.
-        unsafe {
-            let world: &'w UnsafeCell<World> = &*(world as *mut World as *mut UnsafeCell<World>);
-            Self(world as *const UnsafeCell<World> as *mut World, PhantomData)
-        }
+        unsafe { Self(world as *mut World, PhantomData) }
     }
 
     /// This `&mut World` counts as a mutable borrow of every resource and component for the purposes
     /// of safety invariants that talk about borrows on component/resource data not existing. This is
     /// true even for methods that do not explicitly call out `&mut World` as problematic.
     ///
     /// # Safety
+    /// - must have permission to access everything mutably
     /// - there must be no borrows on world
     pub unsafe fn world_mut(self) -> &'w mut World {
         // SAFETY:
@@ -109,6 +107,7 @@ impl<'w> UnsafeWorldCell<'w> {
     /// This can be used for arbitrary shared/readonly access.
     ///
     /// # Safety
+    /// - must have permission to access the whole world immutably
     /// - there must be no live exclusive borrows on world data
     /// - there must be no live exclusive borrow of world
     pub unsafe fn world(self) -> &'w World {
@@ -129,7 +128,7 @@ impl<'w> UnsafeWorldCell<'w> {
     ///
     /// # Safety
     /// - there must be no live exclusive borrow of the world
-    /// - must not be used in a way that would conflcit with any
+    /// - must not be used in a way that would conflict with any
     ///   live exclusive borrows on world data
     unsafe fn unsafe_world(self) -> &'w World {
         // SAFETY:

crates/bevy_ecs/src/world/world_cell.rs

@@ -200,7 +200,7 @@ impl<'w> WorldCell<'w> {
         // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let component_id = unsafe { self.world.components() }.get_resource_id(TypeId::of::<T>())?;
 
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let archetype_component_id = unsafe {
             self.world
                 .get_resource_archetype_component_id(component_id)?
@@ -235,10 +235,10 @@ impl<'w> WorldCell<'w> {
 
     /// Gets a mutable reference to the resource of the given type
     pub fn get_resource_mut<T: Resource>(&self) -> Option<WorldBorrowMut<'_, T>> {
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let component_id = unsafe { self.world.components() }.get_resource_id(TypeId::of::<T>())?;
 
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let archetype_component_id = unsafe {
             self.world
                 .get_resource_archetype_component_id(component_id)?
@@ -272,10 +272,10 @@ impl<'w> WorldCell<'w> {
 
     /// Gets an immutable reference to the non-send resource of the given type, if it exists.
     pub fn get_non_send_resource<T: 'static>(&self) -> Option<WorldBorrow<'_, T>> {
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let component_id = unsafe { self.world.components() }.get_resource_id(TypeId::of::<T>())?;
 
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let archetype_component_id = unsafe {
             self.world
                 .get_non_send_archetype_component_id(component_id)?
@@ -309,10 +309,10 @@ impl<'w> WorldCell<'w> {
 
     /// Gets a mutable reference to the non-send resource of the given type, if it exists.
     pub fn get_non_send_resource_mut<T: 'static>(&self) -> Option<WorldBorrowMut<'_, T>> {
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let component_id = unsafe { self.world.components() }.get_resource_id(TypeId::of::<T>())?;
 
-        // SAFETY: `WorldCell` onyl makes a `&mut World` on drop so its fine to access metadata here
+        // SAFETY: `WorldCell` only makes a `&mut World` on drop so its fine to access metadata here
         let archetype_component_id = unsafe {
             self.world
                 .get_non_send_archetype_component_id(component_id)?