add comment & fix errors

Author: SpecificProtagonist

crates/bevy_ecs/src/bundle.rs

@@ -1217,19 +1217,6 @@ impl<'w> BundleSpawner<'w> {
         &mut self,
         entity: Entity,
         bundle: T,
-    ) -> EntityLocation {
-        self.spawn_non_existent_with_caller(
-            entity,
-            bundle,
-            #[cfg(feature = "track_change_detection")]
-            Location::caller(),
-        )
-    }
-
-    pub(crate) unsafe fn spawn_non_existent_with_caller<T: DynamicBundle>(
-        &mut self,
-        entity: Entity,
-        bundle: T,
         #[cfg(feature = "track_change_detection")] caller: &'static Location<'static>,
     ) -> EntityLocation {
         // SAFETY: We do not make any structural changes to the archetype graph through self.world so these pointers always remain valid
@@ -1317,7 +1304,7 @@ impl<'w> BundleSpawner<'w> {
         let entity = self.entities().alloc();
         // SAFETY: entity is allocated (but non-existent), `T` matches this BundleInfo's type
         unsafe {
-            self.spawn_non_existent_with_caller(
+            self.spawn_non_existent(
                 entity,
                 bundle,
                 #[cfg(feature = "track_change_detection")]

crates/bevy_ecs/src/component.rs

@@ -493,7 +493,8 @@ pub enum StorageType {
     SparseSet,
 }
 
-/// The type used for [`Component`] lifecycle hooks such as `on_add`, `on_insert` or `on_remove`
+/// The type used for [`Component`] lifecycle hooks such as `on_add`, `on_insert` or `on_remove`.
+/// The caller location is `Some` if the `track_change_detection` feature is enabled.
 pub type ComponentHook =
     for<'w> fn(DeferredWorld<'w>, Entity, ComponentId, Option<&'static Location<'static>>);
 

crates/bevy_ecs/src/observer/mod.rs

@@ -1408,6 +1408,7 @@ mod tests {
         world.flush_commands();
     }
 
+    #[test]
     fn observer_triggered_components() {
         #[derive(Resource, Default)]
         struct Counter(HashMap<ComponentId, usize>);

crates/bevy_ecs/src/world/entity_ref.rs

@@ -1813,7 +1813,7 @@ impl<'w> EntityWorldMut<'w> {
         )
     }
 
-    pub fn remove_with_requires_with_caller<T: Bundle>(
+    pub(crate) fn remove_with_requires_with_caller<T: Bundle>(
         &mut self,
         #[cfg(feature = "track_change_detection")] caller: &'static Location<'static>,
     ) -> &mut Self {
@@ -3864,8 +3864,7 @@ unsafe impl DynamicComponentFetch for &'_ HashSet<ComponentId> {
 #[cfg(test)]
 mod tests {
     use bevy_ptr::{OwningPtr, Ptr};
-    use core::panic::AssertUnwindSafe;
-    use std::panic::Location;
+    use core::panic::{AssertUnwindSafe, Location};
 
     use crate::{
         self as bevy_ecs,

crates/bevy_ecs/src/world/mod.rs

@@ -1367,7 +1367,7 @@ impl World {
             let mut bundle_spawner = BundleSpawner::new::<B>(self, change_tick);
             // SAFETY: bundle's type matches `bundle_info`, entity is allocated but non-existent
             unsafe {
-                bundle_spawner.spawn_non_existent_with_caller(
+                bundle_spawner.spawn_non_existent(
                     entity,
                     bundle,
                     #[cfg(feature = "track_change_detection")]
@@ -2511,7 +2511,7 @@ impl World {
                     if let SpawnOrInsert::Spawn(ref mut spawner) = spawn_or_insert {
                         // SAFETY: `entity` is allocated (but non existent), bundle matches inserter
                         unsafe {
-                            spawner.spawn_non_existent_with_caller(
+                            spawner.spawn_non_existent(
                                 entity,
                                 bundle,
                                 #[cfg(feature = "track_change_detection")]
@@ -2524,7 +2524,7 @@ impl World {
                             unsafe { BundleSpawner::new_with_id(self, bundle_id, change_tick) };
                         // SAFETY: `entity` is valid, `location` matches entity, bundle matches inserter
                         unsafe {
-                            spawner.spawn_non_existent_with_caller(
+                            spawner.spawn_non_existent(
                                 entity,
                                 bundle,
                                 #[cfg(feature = "track_change_detection")]