add get_non_send_resource and get_non_send_resource_mut to InteriorMutableWorld

Author: jakobhellermann

crates/bevy_ecs/src/world/interior_mutable_world.rs

@@ -143,6 +143,17 @@ impl<'w> InteriorMutableWorld<'w> {
         self.0.get_resource_by_id(component_id)
     }
 
+    /// Gets a reference to the non-send resource of the given type if it exists
+    ///
+    /// # Safety
+    /// All [`InteriorMutableWorld`] methods take `&self` and thus do not check that there is only one unique reference or multiple shared ones.
+    /// It is the callers responsibility to make sure that there will never be a mutable reference to a value that has other references pointing to it,
+    /// and that no arbitrary safe code can access a `&World` while some value is mutably borrowed.
+    #[inline]
+    pub unsafe fn get_non_send_resource<R: 'static>(&self) -> Option<&'w R> {
+        self.0.get_non_send_resource()
+    }
+
     /// Gets a mutable reference to the resource of the given type if it exists
     ///
     /// # Safety
@@ -195,6 +206,23 @@ impl<'w> InteriorMutableWorld<'w> {
             ticks,
         })
     }
+
+    /// Gets a mutable reference to the non-send resource of the given type if it exists
+    ///
+    /// # Safety
+    /// All [`InteriorMutableWorld`] methods take `&self` and thus do not check that there is only one unique reference or multiple shared ones.
+    /// It is the callers responsibility to make sure that there will never be a mutable reference to a value that has other references pointing to it,
+    /// and that no arbitrary safe code can access a `&World` while some value is mutably borrowed.
+    #[inline]
+    pub unsafe fn get_non_send_resource_mut<R: 'static>(&self) -> Option<Mut<'w, R>> {
+        self.0.validate_non_send_access::<R>();
+        let component_id = self.components().get_resource_id(TypeId::of::<R>())?;
+        // SAFETY:
+        // - `component_id` is type `R`
+        // - we have unique access
+        // - main thread is validated
+        unsafe { self.get_resource_mut_with_id(component_id) }
+    }
 }
 
 impl<'w> InteriorMutableWorld<'w> {
@@ -226,21 +254,4 @@ impl<'w> InteriorMutableWorld<'w> {
             ticks,
         })
     }
-
-    /// # Safety
-    /// - `component_id` must be assigned to a component of type `R`.
-    /// - Caller must ensure this doesn't violate Rust mutability rules for the given resource.
-    ///
-    /// All [`InteriorMutableWorld`] methods take `&self` and thus do not check that there is only one unique reference or multiple shared ones.
-    /// It is the callers responsibility to make sure that there will never be a mutable reference to a value that has other references pointing to it,
-    /// and that no arbitrary safe code can access a `&World` while some value is mutably borrowed.
-    #[inline]
-    pub(crate) unsafe fn get_non_send_mut_with_id<R: 'static>(
-        &self,
-        component_id: ComponentId,
-    ) -> Option<Mut<'w, R>> {
-        self.0.validate_non_send_access::<R>();
-        // SAFETY: we validated nonsend access, the rest of the requirements are deferred to caller
-        unsafe { self.get_resource_mut_with_id(component_id) }
-    }
 }