Skip to content

Commit 91f9322

Browse files
committed
Clippy
1 parent 01594ad commit 91f9322

File tree

9 files changed

+10
-18
lines changed

9 files changed

+10
-18
lines changed

benches/benches/bevy_ecs/observers/propagation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct TestEvent<const N: usize> {
6868
}
6969

7070
fn send_events<const N: usize, const N_EVENTS: usize>(world: &mut World, leaves: &[Entity]) {
71-
let target = *leaves.iter().choose(&mut rand::rng()).unwrap();
71+
let entity = *leaves.iter().choose(&mut rand::rng()).unwrap();
7272

7373
(0..N_EVENTS).for_each(|_| {
7474
world.trigger(TestEvent::<N> { entity });

benches/benches/bevy_ecs/observers/simple.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use core::hint::black_box;
33
use bevy_ecs::{
44
entity::Entity,
55
event::{EntityEvent, Event},
6-
observer::{EventTargets, On},
6+
observer::On,
77
world::World,
88
};
99

@@ -45,7 +45,7 @@ pub fn observe_simple(criterion: &mut Criterion) {
4545
}
4646
entities.shuffle(&mut deterministic_rand());
4747
bencher.iter(|| {
48-
for entity in entities {
48+
for entity in entities.iter().copied() {
4949
world.trigger(SimpleEntityEvent { entity });
5050
}
5151
});

crates/bevy_ecs/macros/src/component.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub fn derive_entity_event(input: TokenStream) -> TokenStream {
8686
processed_attrs.push(AUTO_PROPAGATE);
8787
Ok(())
8888
}
89-
#[allow(deprecated)]
89+
#[expect(deprecated, reason = "we want to continue supporting this for a release")]
9090
Some(ident) if ident == TRAVERSAL => {
9191
Err(meta.error(
9292
"`traversal` has been renamed to `propagate`, use that instead. If you were writing `traversal = &'static ChildOf`, you can now just write `propagate`, which defaults to the `ChildOf` traversal."

crates/bevy_ecs/src/event/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ pub trait Event: Send + Sync + Sized + 'static {
191191
/// #[derive(Component)]
192192
/// #[relationship(relationship_target = ClickableBy)]
193193
/// struct Clickable(Entity);
194-
194+
///
195195
/// #[derive(Component)]
196196
/// #[relationship_target(relationship = Clickable)]
197197
/// struct ClickableBy(Vec<Entity>);
@@ -229,7 +229,7 @@ pub trait Event: Send + Sync + Sized + 'static {
229229
/// entity: Entity,
230230
/// }
231231
/// ```
232-
232+
///
233233
/// You can also _stop_ propagation like this:
234234
/// ```
235235
/// # use bevy_ecs::prelude::*;

crates/bevy_ecs/src/event/trigger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl GlobalTrigger {
7878

7979
/// An [`EntityEvent`] [`Trigger`] that does two things:
8080
/// - Runs all "global" [`Observer`] (ex: registered via [`World::add_observer`](crate::world::World::add_observer))
81-
/// that matches the given [`Event`]. This is the same behavior as [`GlobalTrigger`].
81+
/// that matches the given [`Event`]. This is the same behavior as [`GlobalTrigger`].
8282
/// - Runs every "entity scoped" [`Observer`] that watches the given [`EntityEvent::event_target`] entity.
8383
///
8484
/// The [`EntityEvent`] derive defaults to using this [`Trigger`], and it is usable for any [`EntityEvent`] type.

crates/bevy_ecs/src/observer/distributed_storage.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ use crate::prelude::ReflectComponent;
134134
/// There are some built-in specialized [`Event`] types with custom [`Trigger`] logic:
135135
///
136136
/// - [`EntityEvent`] / [`EntityTrigger`](crate::event::EntityTrigger): An [`Event`] that targets a _specific_ entity. This also has opt-in support for
137-
/// "event bubbling" behavior. See [`EntityEvent`] for details.
137+
/// "event bubbling" behavior. See [`EntityEvent`] for details.
138138
/// - [`EntityComponentsTrigger`](crate::event::EntityComponentsTrigger): An [`Event`] that targets an entity _and_ one or more components on that entity.
139-
/// This is used for [component lifecycle events](crate::lifecycle).
139+
/// This is used for [component lifecycle events](crate::lifecycle).
140140
///
141141
/// You can also define your own!
142142
///
@@ -203,7 +203,6 @@ use crate::prelude::ReflectComponent;
203203
///
204204
/// [`SystemParam`]: crate::system::SystemParam
205205
/// [`Trigger`]: crate::event::Trigger
206-
207206
pub struct Observer {
208207
hook_on_add: ComponentHook,
209208
pub(crate) error_handler: Option<ErrorHandler>,

crates/bevy_ecs/src/observer/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,6 @@ mod tests {
283283
counter: usize,
284284
}
285285

286-
#[derive(EntityEvent)]
287-
struct EntityEventWithData {
288-
entity: Entity,
289-
counter: usize,
290-
}
291-
292286
#[derive(Resource, Default)]
293287
struct Order(Vec<&'static str>);
294288

crates/bevy_ecs/src/observer/system_param.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ impl<'w, E: EntityEvent + for<'t> Event<Trigger<'t> = EntityComponentsTrigger<'t
164164
{
165165
/// A list of all components that were triggered for this [`EntityEvent`].
166166
pub fn triggered_components(&self) -> &[ComponentId] {
167-
&self.trigger.0
167+
self.trigger.0
168168
}
169169
}
170170

crates/bevy_render/src/sync_world.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ mod tests {
503503
use bevy_ecs::{
504504
component::Component,
505505
entity::Entity,
506-
event::EntityEvent,
507506
lifecycle::{Add, Remove},
508507
observer::On,
509508
query::With,

0 commit comments

Comments
 (0)