Merge branch 'main' into main

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.8.1
+
+- Added the `E: EntityEvent` bound to `EventlistenerPlugin<E>`, to move compile errors from adding the plugin, to the event itself.
+- Fixed a benchmark bug.
+- Added helpful error message when `EntityEvent` derive macro fails to find `#[target]`.
+
 # 0.8.0
 
 - Updated to Bevy `0.14.0`

Cargo.toml

@@ -6,7 +6,7 @@ resolver = "2"
 
 [package]
 name = "bevy_eventlistener"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 description = "Event listeners and callbacks for bevy"
 license = "MIT OR Apache-2.0"

benches/benchmarks.rs

@@ -37,7 +37,8 @@ fn event_listeners(c: &mut Criterion) {
                 (
                     spawn_listener_hierarchy,
                     add_listeners_to_hierarchy::<DENSITY, 1>,
-                ),
+                )
+                    .chain(),
             )
             .add_plugins(EventListenerPlugin::<TestEvent<1>>::default())
             .add_systems(First, send_events::<1, N_EVENTS>);

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_eventlistener_derive"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 description = "Event listeners and callbacks for bevy"
 license = "MIT OR Apache-2.0"

macros/src/lib.rs

@@ -29,12 +29,12 @@ pub fn derive(input: TokenStream) -> TokenStream {
                     // Get attributes #[..] on each field
                     for attr in field.attrs.iter() {
                         // Parse the attribute
-                        match attr.meta {
-                            // Find the duplicated idents
-                            syn::Meta::Path(ref path) if path.get_ident().unwrap() == "target" => {
-                                target = Some(field.ident.clone());
+                        if let syn::Meta::Path(ref path) = attr.meta {
+                            if let Some(ident) = path.get_ident() {
+                                if ident == "target" {
+                                    target = Some(field.ident.clone());
+                                }
                             }
-                            _ => (),
                         }
                     }
                 }
@@ -44,7 +44,9 @@ pub fn derive(input: TokenStream) -> TokenStream {
         _ => panic!("Must be a struct"),
     }
 
-    let target = target.unwrap();
+    let Some(target) = target else {
+        panic!("Missing `#[target] attribute. You must annotate the field with the target Entity, or instead manually implement EntityEvent.")
+    };
 
     let gen = quote! {
         impl #impl_generics EntityEvent for #name #ty_generics #where_clause {

src/plugin.rs

@@ -10,9 +10,9 @@ use crate::{event_dispatcher::EventDispatcher, event_listener::EntityEvent};
 pub struct EventListenerSet;
 
 /// Adds event listening and bubbling support for event `E`.
-pub struct EventListenerPlugin<E>(std::marker::PhantomData<E>);
+pub struct EventListenerPlugin<E: EntityEvent>(std::marker::PhantomData<E>);
 
-impl<E> Default for EventListenerPlugin<E> {
+impl<E: EntityEvent> Default for EventListenerPlugin<E> {
     fn default() -> Self {
         Self(std::marker::PhantomData)
     }