[Merged by Bors] - Add a wrapper around Entity for RemovedComponents

crates/bevy_ecs/src/removal_detection.rs

@@ -19,14 +19,18 @@ use std::{
     option,
 };
 
-/// Wrapper around a [`ManualEventReader<Entity>`] so that we
+/// Wrapper around [`Entity`] for [`RemovedComponents`].
+#[derive(Debug, Clone)]
+pub struct RemovedComponentEntity(pub Entity);
+
+/// Wrapper around a [`ManualEventReader<RemovedComponentEntity>`] so that we
 /// can differentiate events between components.
 #[derive(Debug)]
 pub struct RemovedComponentReader<T>
 where
     T: Component,
 {
-    reader: ManualEventReader<Entity>,
+    reader: ManualEventReader<RemovedComponentEntity>,
     marker: PhantomData<T>,
 }
 
@@ -40,7 +44,7 @@ impl<T: Component> Default for RemovedComponentReader<T> {
 }
 
 impl<T: Component> Deref for RemovedComponentReader<T> {
-    type Target = ManualEventReader<Entity>;
+    type Target = ManualEventReader<RemovedComponentEntity>;
     fn deref(&self) -> &Self::Target {
         &self.reader
     }
@@ -56,7 +60,7 @@ impl<T: Component> DerefMut for RemovedComponentReader<T> {
 /// So that we can find the events without naming the type directly.
 #[derive(Default, Debug)]
 pub struct RemovedComponentEvents {
-    event_sets: SparseSet<ComponentId, Events<Entity>>,
+    event_sets: SparseSet<ComponentId, Events<RemovedComponentEntity>>,
 }
 
 impl RemovedComponentEvents {
@@ -70,14 +74,17 @@ impl RemovedComponentEvents {
         }
     }
 
-    pub fn get(&self, component_id: impl Into<ComponentId>) -> Option<&Events<Entity>> {
+    pub fn get(
+        &self,
+        component_id: impl Into<ComponentId>,
+    ) -> Option<&Events<RemovedComponentEntity>> {
         self.event_sets.get(component_id.into())
     }
 
     pub fn send(&mut self, component_id: impl Into<ComponentId>, entity: Entity) {
         self.event_sets
             .get_or_insert_with(component_id.into(), Default::default)
-            .send(entity);
+            .send(RemovedComponentEntity(entity));
     }
 }
 
@@ -123,7 +130,7 @@ pub struct RemovedComponents<'w, 's, T: Component> {
 ///
 /// See [`RemovedComponents`].
 pub type RemovedIter<'a> =
-    iter::Flatten<option::IntoIter<iter::Cloned<ManualEventIterator<'a, Entity>>>>;
+    iter::Flatten<option::IntoIter<iter::Cloned<ManualEventIterator<'a, RemovedComponentEntity>>>>;
 
 impl<'w, 's, T: Component> RemovedComponents<'w, 's, T> {
     pub fn iter(&mut self) -> RemovedIter<'_> {
@@ -139,7 +146,7 @@ impl<'a, 'w, 's: 'a, T> IntoIterator for &'a mut RemovedComponents<'w, 's, T>
 where
     T: Component,
 {
-    type Item = Entity;
+    type Item = RemovedComponentEntity;
     type IntoIter = RemovedIter<'a>;
     fn into_iter(self) -> Self::IntoIter {
         self.iter()

crates/bevy_ecs/src/system/mod.rs

@@ -608,7 +608,7 @@ mod tests {
             mut n_systems: ResMut<NSystems>,
         ) {
             assert_eq!(
-                removed_i32.iter().collect::<Vec<_>>(),
+                removed_i32.iter().map(|e| e.0).collect::<Vec<_>>(),
                 &[despawned.0],
                 "despawning causes the correct entity to show up in the 'RemovedComponent' system parameter."
             );
@@ -636,7 +636,7 @@ mod tests {
             // The despawned entity from the previous frame was
             // double buffered so we now have it in this system as well.
             assert_eq!(
-                removed_i32.iter().collect::<Vec<_>>(),
+                removed_i32.iter().map(|e| e.0).collect::<Vec<_>>(),
                 &[despawned.0, removed.0],
                 "removing a component causes the correct entity to show up in the 'RemovedComponent' system parameter."
             );

crates/bevy_ecs/src/world/mod.rs

@@ -791,6 +791,7 @@ impl World {
             .map(|removed| removed.iter_current_update_events().cloned())
             .into_iter()
             .flatten()
+            .map(|e| e.0)
     }
 
     /// Initializes a new resource and returns the [`ComponentId`] created for it.

crates/bevy_ui/src/flex/mod.rs

@@ -281,14 +281,14 @@ pub fn flex_node_system(
     }
 
     // clean up removed nodes
-    flex_surface.remove_entities(removed_nodes.iter());
+    flex_surface.remove_entities(removed_nodes.iter().map(|e| e.0));
 
     // update window children (for now assuming all Nodes live in the primary window)
     flex_surface.set_window_children(primary_window_entity, root_node_query.iter());
 
     // update and remove children
     for entity in removed_children.iter() {
-        flex_surface.try_remove_children(entity);
+        flex_surface.try_remove_children(entity.0);
     }
     for (entity, children) in &children_query {
         flex_surface.update_children(entity, children);

crates/bevy_winit/src/system.rs

@@ -96,12 +96,13 @@ pub(crate) fn despawn_window(
     mut winit_windows: NonSendMut<WinitWindows>,
 ) {
     for window in closed.iter() {
-        info!("Closing window {:?}", window);
+        let entity = window.0;
+        info!("Closing window {:?}", entity);
         // Guard to verify that the window is in fact actually gone,
         // rather than having the component added and removed in the same frame.
-        if !window_entities.contains(window) {
-            winit_windows.remove_window(window);
-            close_events.send(WindowClosed { window });
+        if !window_entities.contains(entity) {
+            winit_windows.remove_window(entity);
+            close_events.send(WindowClosed { window: entity });
         }
     }
 }