Deref and don't allow modifying the component id

Author: Aceeri

crates/bevy_ecs/src/component.rs

@@ -676,7 +676,7 @@ impl ComponentTicks {
 
 /// Initialize and fetch a component id for a generic type.
 pub struct ComponentIdFor<T: Component> {
-    pub component_id: ComponentId,
+    component_id: ComponentId,
     phantom: PhantomData<T>,
 }
 
@@ -689,18 +689,15 @@ impl<T: Component> FromWorld for ComponentIdFor<T> {
     }
 }
 
-impl<T: Component> Copy for ComponentIdFor<T> {}
-impl<T: Component> Clone for ComponentIdFor<T> {
-    fn clone(&self) -> Self {
-        Self {
-            component_id: self.component_id,
-            phantom: PhantomData,
-        }
+impl<T: Component> std::ops::Deref for ComponentIdFor<T> {
+    type Target = ComponentId;
+    fn deref(&self) -> &Self::Target {
+        &self.component_id
     }
 }
 
 impl<T: Component> From<ComponentIdFor<T>> for ComponentId {
     fn from(to_component_id: ComponentIdFor<T>) -> ComponentId {
-        to_component_id.component_id
+        *to_component_id
     }
 }

crates/bevy_ecs/src/removal_detection.rs

@@ -114,7 +114,7 @@ pub struct RemovedComponents<'w, 's, T: Component> {
 
 impl<'w, 's, T: Component> RemovedComponents<'w, 's, T> {
     pub fn iter(&mut self) -> Box<dyn Iterator<Item = Entity> + '_> {
-        if let Some(events) = self.event_sets.get(*self.component_id) {
+        if let Some(events) = self.event_sets.get(**self.component_id) {
             // TODO: Make this an actually name-able type so we don't need to box
             Box::new(self.reader.iter(events).cloned())
         } else {