Skip to content

Commit 0e0ad70

Browse files
committed
appease clippy
1 parent faaed3a commit 0e0ad70

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

crates/bevy_animation/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ use std::{
2525
use bevy_app::{App, Plugin, PostUpdate};
2626
use bevy_asset::{Asset, AssetApp, Assets, Handle};
2727
use bevy_core::Name;
28-
use bevy_ecs::{
29-
entity::MapEntities, prelude::*, reflect::ReflectMapEntities, world::EntityMutExcept,
30-
};
28+
use bevy_ecs::{prelude::*, reflect::ReflectMapEntities, world::EntityMutExcept};
3129
use bevy_math::FloatExt;
3230
use bevy_reflect::{
3331
prelude::ReflectDefault, utility::NonGenericTypeInfoCell, ApplyError, DynamicStruct, FieldIter,

crates/bevy_ecs/src/entity/map_entities.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ where
3838
T: IterEntities,
3939
{
4040
fn map_entities<F: FnMut(Entity)>(&self, f: F) {
41-
self.iter_entities().for_each(f)
41+
self.iter_entities().for_each(f);
4242
}
4343
}
4444

@@ -47,7 +47,7 @@ where
4747
T: MapEntities + IterEntitiesMut,
4848
{
4949
fn map_entities_mut<F: FnMut(&mut Entity)>(&mut self, f: F) {
50-
self.iter_entities_mut().for_each(f)
50+
self.iter_entities_mut().for_each(f);
5151
}
5252
}
5353

crates/bevy_ecs/src/reflect/map_entities.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
component::Component,
3-
entity::{Entity, EntityHashMap, EntityMapper, MapEntities, MapEntitiesMut, SceneEntityMapper},
3+
entity::{Entity, EntityHashMap, EntityMapper, MapEntitiesMut, SceneEntityMapper},
44
world::World,
55
};
66
use bevy_reflect::{FromReflect, FromType, PartialReflect};
@@ -58,7 +58,7 @@ impl ReflectMapEntities {
5858
/// A general method for applying an operation to all entities in a
5959
/// reflected component.
6060
pub fn map_entities(&self, component: &dyn PartialReflect, f: &mut dyn FnMut(Entity)) {
61-
(self.map_entities)(component, f)
61+
(self.map_entities)(component, f);
6262
}
6363

6464
/// A general method for applying an operation that may modify entities in a
@@ -68,7 +68,7 @@ impl ReflectMapEntities {
6868
component: &mut dyn PartialReflect,
6969
f: &mut dyn FnMut(&mut Entity),
7070
) {
71-
(self.map_entities_mut)(component, f)
71+
(self.map_entities_mut)(component, f);
7272
}
7373
}
7474

crates/bevy_hierarchy/src/components/children.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#[cfg(feature = "reflect")]
22
use bevy_ecs::reflect::{ReflectComponent, ReflectFromWorld, ReflectMapEntities};
3-
use bevy_ecs::{
4-
component::Component,
5-
entity::{Entity, MapEntitiesMut},
6-
prelude::FromWorld,
7-
world::World,
8-
};
3+
use bevy_ecs::{component::Component, entity::Entity, prelude::FromWorld, world::World};
94
use core::slice;
105
use smallvec::SmallVec;
116
use std::ops::Deref;
@@ -168,6 +163,8 @@ impl<'a> IntoIterator for &'a Children {
168163

169164
#[cfg(test)]
170165
mod test {
166+
use bevy_ecs::entity::MapEntitiesMut;
167+
171168
use super::*;
172169

173170
fn assert_impls_map_entities_mut<M: MapEntitiesMut>() {}

crates/bevy_render/src/mesh/mesh/skinning.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
use bevy_asset::{Asset, Handle};
22
use bevy_ecs::{
3-
component::Component,
4-
entity::{Entity, EntityMapper, MapEntities},
5-
prelude::ReflectComponent,
6-
reflect::ReflectMapEntities,
3+
component::Component, entity::Entity, prelude::ReflectComponent, reflect::ReflectMapEntities,
74
};
85
use bevy_math::Mat4;
96
use bevy_reflect::prelude::*;

crates/bevy_window/src/window.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use std::{iter, num::NonZero, option};
1+
use std::{num::NonZero, option};
22

33
use bevy_ecs::{
4-
entity::{Entity, EntityMapper, MapEntities},
4+
entity::Entity,
55
prelude::{Component, ReflectComponent},
66
};
77
use bevy_math::{DVec2, IVec2, UVec2, Vec2};
@@ -1230,11 +1230,11 @@ mod tests {
12301230

12311231
use super::*;
12321232

1233-
// Compile-time assertion that a type implementes MapEntitiesMut
1233+
// Compile-time assertion that a type implements MapEntitiesMut
12341234
fn impl_map_entities_mut<M: MapEntitiesMut>() {}
12351235

12361236
// Ensure that WidowRef implements MapEntitiesMut
1237-
#[allow(dead_code)]
1237+
#[test]
12381238
fn window_impls_map_entities_mut() {
12391239
impl_map_entities_mut::<WindowRef>();
12401240
}

0 commit comments

Comments
 (0)