From 92e6a57d224085b37a2e52bcbe2d9c23a5a8d14a Mon Sep 17 00:00:00 2001
From: james7132 <contact@jamessliu.com>
Date: Sun, 12 Mar 2023 20:18:36 -0700
Subject: [PATCH 1/2] Make BundleInfo's fields not pub(crate)

---
 crates/bevy_ecs/src/bundle.rs           |  6 +++---
 crates/bevy_ecs/src/world/entity_ref.rs | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/bevy_ecs/src/bundle.rs b/crates/bevy_ecs/src/bundle.rs
index 66fe6cdbcfb8b..ae37fdcdccd0e 100644
--- a/crates/bevy_ecs/src/bundle.rs
+++ b/crates/bevy_ecs/src/bundle.rs
@@ -261,13 +261,13 @@ impl SparseSetIndex for BundleId {
 }
 
 pub struct BundleInfo {
-    pub(crate) id: BundleId,
-    pub(crate) component_ids: Vec<ComponentId>,
+    id: BundleId,
+    component_ids: Vec<ComponentId>,
 }
 
 impl BundleInfo {
     #[inline]
-    pub fn id(&self) -> BundleId {
+    pub const fn id(&self) -> BundleId {
         self.id
     }
 
diff --git a/crates/bevy_ecs/src/world/entity_ref.rs b/crates/bevy_ecs/src/world/entity_ref.rs
index 1511b7fe889b6..8981f8b427249 100644
--- a/crates/bevy_ecs/src/world/entity_ref.rs
+++ b/crates/bevy_ecs/src/world/entity_ref.rs
@@ -311,7 +311,7 @@ impl<'w> EntityMut<'w> {
             return None;
         }
 
-        let mut bundle_components = bundle_info.component_ids.iter().cloned();
+        let mut bundle_components = bundle_info.components().iter().cloned();
         let entity = self.entity;
         // SAFETY: bundle components are iterated in order, which guarantees that the component type
         // matches
@@ -463,7 +463,7 @@ impl<'w> EntityMut<'w> {
 
         let old_archetype = &mut archetypes[old_location.archetype_id];
         let entity = self.entity;
-        for component_id in bundle_info.component_ids.iter().cloned() {
+        for component_id in bundle_info.components().iter().cloned() {
             if old_archetype.contains(component_id) {
                 removed_components.send(component_id, entity);
 
@@ -694,9 +694,9 @@ unsafe fn remove_bundle_from_archetype(
     let remove_bundle_result = {
         let current_archetype = &mut archetypes[archetype_id];
         if intersection {
-            current_archetype.edges().get_remove_bundle(bundle_info.id)
+            current_archetype.edges().get_remove_bundle(bundle_info.id())
         } else {
-            current_archetype.edges().get_take_bundle(bundle_info.id)
+            current_archetype.edges().get_take_bundle(bundle_info.id())
         }
     };
     let result = if let Some(result) = remove_bundle_result {
@@ -710,7 +710,7 @@ unsafe fn remove_bundle_from_archetype(
             let current_archetype = &mut archetypes[archetype_id];
             let mut removed_table_components = Vec::new();
             let mut removed_sparse_set_components = Vec::new();
-            for component_id in bundle_info.component_ids.iter().cloned() {
+            for component_id in bundle_info.components().iter().cloned() {
                 if current_archetype.contains(component_id) {
                     // SAFETY: bundle components were already initialized by bundles.get_info
                     let component_info = components.get_info_unchecked(component_id);
@@ -724,7 +724,7 @@ unsafe fn remove_bundle_from_archetype(
                     // graph
                     current_archetype
                         .edges_mut()
-                        .insert_take_bundle(bundle_info.id, None);
+                        .insert_take_bundle(bundle_info.id(), None);
                     return None;
                 }
             }
@@ -763,11 +763,11 @@ unsafe fn remove_bundle_from_archetype(
     if intersection {
         current_archetype
             .edges_mut()
-            .insert_remove_bundle(bundle_info.id, result);
+            .insert_remove_bundle(bundle_info.id(), result);
     } else {
         current_archetype
             .edges_mut()
-            .insert_take_bundle(bundle_info.id, result);
+            .insert_take_bundle(bundle_info.id(), result);
     }
     result
 }

From 8a9210eae4ab4b07071177ecdbafb9f178401117 Mon Sep 17 00:00:00 2001
From: james7132 <contact@jamessliu.com>
Date: Sun, 12 Mar 2023 20:28:23 -0700
Subject: [PATCH 2/2] Formatting

---
 crates/bevy_ecs/src/world/entity_ref.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_ecs/src/world/entity_ref.rs b/crates/bevy_ecs/src/world/entity_ref.rs
index 8981f8b427249..5a60d0a7b5721 100644
--- a/crates/bevy_ecs/src/world/entity_ref.rs
+++ b/crates/bevy_ecs/src/world/entity_ref.rs
@@ -694,7 +694,9 @@ unsafe fn remove_bundle_from_archetype(
     let remove_bundle_result = {
         let current_archetype = &mut archetypes[archetype_id];
         if intersection {
-            current_archetype.edges().get_remove_bundle(bundle_info.id())
+            current_archetype
+                .edges()
+                .get_remove_bundle(bundle_info.id())
         } else {
             current_archetype.edges().get_take_bundle(bundle_info.id())
         }