forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary bounds on EntityClonerBuilder::without_required_components (#17969)

Browse Source 
## Objective

The closure argument for
`EntityClonerBuilder::without_required_components` has `Send + Sync +
'static` bounds, but the closure immediately gets called and never needs
to be sent anywhere. (This was my fault :P )

## Solution

Remove the bounds so that users aren't unnecessarily restricted.

I also took the opportunity to expand the tests a little.
This commit is contained in:
JaySpruce 2025-02-25 17:34:46 -06:00 committed by GitHub
parent 2f633c18ba
commit 36a2f7fdf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/bevy_ecs/src/entity/clone_entities.rs
View File

@ -609,7 +609,7 @@ impl<'w> EntityClonerBuilder<'w> {
/// will not involve required components. /// will not involve required components.
pub fn without_required_components( pub fn without_required_components(
&mut self, &mut self,
builder: impl FnOnce(&mut EntityClonerBuilder) + Send + Sync + 'static, builder: impl FnOnce(&mut EntityClonerBuilder),
) -> &mut Self { ) -> &mut Self {
self.attach_required_components = false; self.attach_required_components = false;
builder(self); builder(self);
@ -1189,9 +1189,7 @@ mod tests {
EntityCloner::build(&mut world) EntityCloner::build(&mut world)
.deny_all() .deny_all()
.without_required_components(|builder| { .allow::<B>()
builder.allow::<B>();
})
.clone_entity(e, e_clone); .clone_entity(e, e_clone);
assert_eq!(world.entity(e_clone).get::<A>(), None); assert_eq!(world.entity(e_clone).get::<A>(), None);
@ -1199,6 +1197,36 @@ mod tests {
assert_eq!(world.entity(e_clone).get::<C>(), Some(&C(5))); assert_eq!(world.entity(e_clone).get::<C>(), Some(&C(5)));
} }
#[test]
fn clone_entity_with_default_required_components() {
#[derive(Component, Clone, PartialEq, Debug)]
#[require(B)]
struct A;
#[derive(Component, Clone, PartialEq, Debug, Default)]
#[require(C(|| C(5)))]
struct B;
#[derive(Component, Clone, PartialEq, Debug)]
struct C(u32);
let mut world = World::default();
let e = world.spawn((A, C(0))).id();
let e_clone = world.spawn_empty().id();
EntityCloner::build(&mut world)
.deny_all()
.without_required_components(|builder| {
builder.allow::<A>();
})
.clone_entity(e, e_clone);
assert_eq!(world.entity(e_clone).get::<A>(), Some(&A));
assert_eq!(world.entity(e_clone).get::<B>(), Some(&B));
assert_eq!(world.entity(e_clone).get::<C>(), Some(&C(5)));
}
#[test] #[test]
fn clone_entity_with_dynamic_components() { fn clone_entity_with_dynamic_components() {
const COMPONENT_SIZE: usize = 10; const COMPONENT_SIZE: usize = 10;