From c33033a5e7de4cea87dce5a25cb2f277b3f7e4ea Mon Sep 17 00:00:00 2001
From: Giacomo Stevanato <giaco.stevanato@gmail.com>
Date: Mon, 2 Jun 2025 18:44:49 +0200
Subject: [PATCH] Switch EntityWorldMut::retain to StaticBundle

---
 crates/bevy_ecs/src/system/commands/entity_command.rs | 4 ++--
 crates/bevy_ecs/src/system/commands/mod.rs            | 2 +-
 crates/bevy_ecs/src/world/entity_ref.rs               | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_ecs/src/system/commands/entity_command.rs b/crates/bevy_ecs/src/system/commands/entity_command.rs
index b2cc0cdb72..f9eb516f0c 100644
--- a/crates/bevy_ecs/src/system/commands/entity_command.rs
+++ b/crates/bevy_ecs/src/system/commands/entity_command.rs
@@ -190,9 +190,9 @@ pub fn clear() -> impl EntityCommand {
 }
 
 /// An [`EntityCommand`] that removes all components from an entity,
-/// except for those in the given [`Bundle`].
+/// except for those in the given [`StaticBundle`].
 #[track_caller]
-pub fn retain<T: Bundle>() -> impl EntityCommand {
+pub fn retain<T: StaticBundle>() -> impl EntityCommand {
     let caller = MaybeLocation::caller();
     move |mut entity: EntityWorldMut| {
         entity.retain_with_caller::<T>(caller);
diff --git a/crates/bevy_ecs/src/system/commands/mod.rs b/crates/bevy_ecs/src/system/commands/mod.rs
index b0c757dc07..ebfde2b602 100644
--- a/crates/bevy_ecs/src/system/commands/mod.rs
+++ b/crates/bevy_ecs/src/system/commands/mod.rs
@@ -1943,7 +1943,7 @@ impl<'a> EntityCommands<'a> {
     /// # bevy_ecs::system::assert_is_system(remove_combat_stats_system);
     /// ```
     #[track_caller]
-    pub fn retain<B: Bundle>(&mut self) -> &mut Self {
+    pub fn retain<B: StaticBundle>(&mut self) -> &mut Self {
         self.queue(entity_command::retain::<B>())
     }
 
diff --git a/crates/bevy_ecs/src/world/entity_ref.rs b/crates/bevy_ecs/src/world/entity_ref.rs
index bb40ed83d7..71e2bf89dc 100644
--- a/crates/bevy_ecs/src/world/entity_ref.rs
+++ b/crates/bevy_ecs/src/world/entity_ref.rs
@@ -2151,12 +2151,15 @@ impl<'w> EntityWorldMut<'w> {
     ///
     /// If the entity has been despawned while this `EntityWorldMut` is still alive.
     #[track_caller]
-    pub fn retain<T: Bundle>(&mut self) -> &mut Self {
+    pub fn retain<T: StaticBundle>(&mut self) -> &mut Self {
         self.retain_with_caller::<T>(MaybeLocation::caller())
     }
 
     #[inline]
-    pub(crate) fn retain_with_caller<T: Bundle>(&mut self, caller: MaybeLocation) -> &mut Self {
+    pub(crate) fn retain_with_caller<T: StaticBundle>(
+        &mut self,
+        caller: MaybeLocation,
+    ) -> &mut Self {
         let old_location = self.location();
         let archetypes = &mut self.world.archetypes;
         let storages = &mut self.world.storages;
@@ -2168,7 +2171,7 @@ impl<'w> EntityWorldMut<'w> {
         let retained_bundle = self
             .world
             .bundles
-            .register_info::<T>(&mut registrator, storages);
+            .register_static_info::<T>(&mut registrator, storages);
         // SAFETY: `retained_bundle` exists as we just initialized it.
         let retained_bundle_info = unsafe { self.world.bundles.get_unchecked(retained_bundle) };
         let old_archetype = &mut archetypes[old_location.archetype_id];