bevy_derive: Add #[deref] attribute

Cargo.toml

@@ -16,6 +16,7 @@ rust-version = "1.67.0"
 exclude = [
   "benches",
   "crates/bevy_ecs_compile_fail_tests",
+  "crates/bevy_macros_compile_fail_tests",
   "crates/bevy_reflect_compile_fail_tests",
 ]
 members = [

crates/bevy_derive/src/derefs.rs

@@ -1,12 +1,16 @@
 use proc_macro::{Span, TokenStream};
 use quote::quote;
-use syn::{parse_macro_input, Data, DeriveInput, Index, Member, Type};
+use syn::{parse_macro_input, Data, DeriveInput, Field, Index, Member, Type};
+
+const DEREF: &str = "Deref";
+const DEREF_MUT: &str = "DerefMut";
+const DEREF_ATTR: &str = "deref";
 
 pub fn derive_deref(input: TokenStream) -> TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
 
     let ident = &ast.ident;
-    let (field_member, field_type) = match get_inner_field(&ast, false) {
+    let (field_member, field_type) = match get_deref_field(&ast, false) {
         Ok(items) => items,
         Err(err) => {
             return err.into_compile_error().into();
@@ -29,7 +33,7 @@ pub fn derive_deref_mut(input: TokenStream) -> TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
 
     let ident = &ast.ident;
-    let (field_member, _) = match get_inner_field(&ast, true) {
+    let (field_member, _) = match get_deref_field(&ast, true) {
         Ok(items) => items,
         Err(err) => {
             return err.into_compile_error().into();
@@ -46,24 +50,62 @@ pub fn derive_deref_mut(input: TokenStream) -> TokenStream {
     })
 }
 
-fn get_inner_field(ast: &DeriveInput, is_mut: bool) -> syn::Result<(Member, &Type)> {
+fn get_deref_field(ast: &DeriveInput, is_mut: bool) -> syn::Result<(Member, &Type)> {
+    let deref_kind = if is_mut { DEREF_MUT } else { DEREF };
+    let deref_attr_str = format!("`#[{DEREF_ATTR}]`");
+
     match &ast.data {
+        Data::Struct(data_struct) if data_struct.fields.is_empty() => Err(syn::Error::new(
+            Span::call_site().into(),
+            format!("{deref_kind} cannot be derived on field-less structs"),
+        )),
         Data::Struct(data_struct) if data_struct.fields.len() == 1 => {
             let field = data_struct.fields.iter().next().unwrap();
-            let member = field
-                .ident
-                .as_ref()
-                .map(|name| Member::Named(name.clone()))
-                .unwrap_or_else(|| Member::Unnamed(Index::from(0)));
+            let member = to_member(field, 0);
             Ok((member, &field.ty))
         }
-        _ => {
-            let msg = if is_mut {
-                "DerefMut can only be derived for structs with a single field"
+        Data::Struct(data_struct) => {
+            let mut selected_field: Option<(Member, &Type)> = None;
+            for (index, field) in data_struct.fields.iter().enumerate() {
+                for attr in &field.attrs {
+                    if !attr.meta.require_path_only()?.is_ident(DEREF_ATTR) {
+                        continue;
+                    }
+
+                    if selected_field.is_some() {
+                        return Err(syn::Error::new_spanned(
+                            attr,
+                            format!(
+                                "{deref_attr_str} attribute can only be used on a single field"
+                            ),
+                        ));
+                    }
+
+                    let member = to_member(field, index);
+                    selected_field = Some((member, &field.ty));
+                }
+            }
+
+            if let Some(selected_field) = selected_field {
+                Ok(selected_field)
             } else {
-                "Deref can only be derived for structs with a single field"
-            };
-            Err(syn::Error::new(Span::call_site().into(), msg))
+                Err(syn::Error::new(
+                    Span::call_site().into(),
+                    format!("deriving {deref_kind} on multi-field structs requires one field to have the {deref_attr_str} attribute"),
+                ))
+            }
         }
+        _ => Err(syn::Error::new(
+            Span::call_site().into(),
+            format!("{deref_kind} can only be derived on structs"),
+        )),
     }
 }
+
+fn to_member(field: &Field, index: usize) -> Member {
+    field
+        .ident
+        .as_ref()
+        .map(|name| Member::Named(name.clone()))
+        .unwrap_or_else(|| Member::Unnamed(Index::from(index)))
+}

crates/bevy_derive/src/lib.rs

@@ -17,41 +17,104 @@ pub fn derive_dynamic_plugin(input: TokenStream) -> TokenStream {
     app_plugin::derive_dynamic_plugin(input)
 }
 
-/// Implements [`Deref`] for _single-item_ structs. This is especially useful when
-/// utilizing the [newtype] pattern.
+/// Implements [`Deref`] for structs. This is especially useful when utilizing the [newtype] pattern.
+///
+/// For single-field structs, the implementation automatically uses that field.
+/// For multi-field structs, you must specify which field to use with the `#[deref]` attribute.
 ///
 /// If you need [`DerefMut`] as well, consider using the other [derive] macro alongside
 /// this one.
 ///
 /// # Example
 ///
+/// ## Tuple Structs
+///
+/// Using a single-field struct:
+///
 /// ```
 /// use bevy_derive::Deref;
 ///
 /// #[derive(Deref)]
 /// struct MyNewtype(String);
 ///
 /// let foo = MyNewtype(String::from("Hello"));
-/// assert_eq!(5, foo.len());
+/// assert_eq!("Hello", *foo);
+/// ```
+///
+/// Using a multi-field struct:
+///
+/// ```
+/// # use std::marker::PhantomData;
+/// use bevy_derive::Deref;
+///
+/// #[derive(Deref)]
+/// struct MyStruct<T>(#[deref] String, PhantomData<T>);
+///
+/// let foo = MyStruct(String::from("Hello"), PhantomData::<usize>);
+/// assert_eq!("Hello", *foo);
+/// ```
+///
+/// ## Named Structs
+///
+/// Using a single-field struct:
+///
+/// ```
+/// use bevy_derive::{Deref, DerefMut};
+///
+/// #[derive(Deref, DerefMut)]
+/// struct MyStruct {
+///   value: String,
+/// }
+///
+/// let foo = MyStruct {
+///   value: String::from("Hello")
+/// };
+/// assert_eq!("Hello", *foo);
+/// ```
+///
+/// Using a multi-field struct:
+///
+/// ```
+/// # use std::marker::PhantomData;
+/// use bevy_derive::{Deref, DerefMut};
+///
+/// #[derive(Deref, DerefMut)]
+/// struct MyStruct<T> {
+///   #[deref]
+///   value: String,
+///   _phantom: PhantomData<T>,
+/// }
+///
+/// let foo = MyStruct {
+///   value:String::from("Hello"),
+///   _phantom:PhantomData::<usize>
+/// };
+/// assert_eq!("Hello", *foo);
 /// ```
 ///
 /// [`Deref`]: std::ops::Deref
 /// [newtype]: https://doc.rust-lang.org/rust-by-example/generics/new_types.html
 /// [`DerefMut`]: std::ops::DerefMut
 /// [derive]: crate::derive_deref_mut
-#[proc_macro_derive(Deref)]
+#[proc_macro_derive(Deref, attributes(deref))]
 pub fn derive_deref(input: TokenStream) -> TokenStream {
     derefs::derive_deref(input)
 }
 
-/// Implements [`DerefMut`] for _single-item_ structs. This is especially useful when
-/// utilizing the [newtype] pattern.
+/// Implements [`DerefMut`] for structs. This is especially useful when utilizing the [newtype] pattern.
+///
+/// For single-field structs, the implementation automatically uses that field.
+/// For multi-field structs, you must specify which field to use with the `#[deref]` attribute.
 ///
 /// [`DerefMut`] requires a [`Deref`] implementation. You can implement it manually or use
 /// Bevy's [derive] macro for convenience.
 ///
 /// # Example
 ///
+/// ## Tuple Structs
+///
+/// Using a single-field struct:
+///
 /// ```
 /// use bevy_derive::{Deref, DerefMut};
 ///
@@ -63,11 +126,65 @@ pub fn derive_deref(input: TokenStream) -> TokenStream {
 /// assert_eq!("Hello World!", *foo);
 /// ```
 ///
+/// Using a multi-field struct:
+///
+/// ```
+/// # use std::marker::PhantomData;
+/// use bevy_derive::{Deref, DerefMut};
+///
+/// #[derive(Deref, DerefMut)]
+/// struct MyStruct<T>(#[deref] String, PhantomData<T>);
+///
+/// let mut foo = MyStruct(String::from("Hello"), PhantomData::<usize>);
+/// foo.push_str(" World!");
+/// assert_eq!("Hello World!", *foo);
+/// ```
+///
+/// ## Named Structs
+///
+/// Using a single-field struct:
+///
+/// ```
+/// use bevy_derive::{Deref, DerefMut};
+///
+/// #[derive(Deref, DerefMut)]
+/// struct MyStruct {
+///   value: String,
+/// }
+///
+/// let mut foo = MyStruct {
+///   value: String::from("Hello")
+/// };
+/// foo.push_str(" World!");
+/// assert_eq!("Hello World!", *foo);
+/// ```
+///
+/// Using a multi-field struct:
+///
+/// ```
+/// # use std::marker::PhantomData;
+/// use bevy_derive::{Deref, DerefMut};
+///
+/// #[derive(Deref, DerefMut)]
+/// struct MyStruct<T> {
+///   #[deref]
+///   value: String,
+///   _phantom: PhantomData<T>,
+/// }
+///
+/// let mut foo = MyStruct {
+///   value:String::from("Hello"),
+///   _phantom:PhantomData::<usize>
+/// };
+/// foo.push_str(" World!");
+/// assert_eq!("Hello World!", *foo);
+/// ```
+///
 /// [`DerefMut`]: std::ops::DerefMut
 /// [newtype]: https://doc.rust-lang.org/rust-by-example/generics/new_types.html
 /// [`Deref`]: std::ops::Deref
 /// [derive]: crate::derive_deref
-#[proc_macro_derive(DerefMut)]
+#[proc_macro_derive(DerefMut, attributes(deref))]
 pub fn derive_deref_mut(input: TokenStream) -> TokenStream {
     derefs::derive_deref_mut(input)
 }

crates/bevy_macros_compile_fail_tests/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "bevy_macros_compile_fail_tests"
+version = "0.1.0"
+edition = "2021"
+description = "Compile fail tests for Bevy Engine's various macros"
+homepage = "https://bevyengine.org"
+repository = "/~https://github.com/bevyengine/bevy"
+license = "MIT OR Apache-2.0"
+publish = false
+
+[dependencies]
+bevy_derive = { path = "../bevy_derive" }
+trybuild = "1.0.71"

crates/bevy_macros_compile_fail_tests/README.md

@@ -0,0 +1,6 @@
+# Compile fail tests for Bevy macros
+
+This crate is not part of the Bevy workspace in order to not fail `crater` tests for Bevy.
+The tests assert on the exact compiler errors and can easily fail for new Rust versions due to updated compiler errors (e.g. changes in spans).
+
+The `CI` workflow executes these tests on the stable rust toolchain (see [tools/ci](../../tools/ci/src/main.rs)).

crates/bevy_macros_compile_fail_tests/src/lib.rs

@@ -0,0 +1 @@
+// Nothing here, check out the integration tests

crates/bevy_macros_compile_fail_tests/tests/deref_derive.rs

@@ -0,0 +1,6 @@
+#[test]
+fn test() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/deref_derive/*.fail.rs");
+    t.pass("tests/deref_derive/*.pass.rs");
+}

crates/bevy_macros_compile_fail_tests/tests/deref_derive/invalid_attribute.fail.rs

@@ -0,0 +1,15 @@
+use bevy_derive::Deref;
+
+// Reason: `#[deref]` doesn't take any arguments
+
+#[derive(Deref)]
+struct TupleStruct(usize, #[deref()] String);
+
+#[derive(Deref)]
+struct Struct {
+    foo: usize,
+    #[deref()]
+    bar: String,
+}
+
+fn main() {}

crates/bevy_macros_compile_fail_tests/tests/deref_derive/invalid_attribute.fail.stderr

@@ -0,0 +1,11 @@
+error: unexpected token in attribute
+ --> tests/deref_derive/invalid_attribute.fail.rs:6:34
+  |
+6 | struct TupleStruct(usize, #[deref()] String);
+  |                                  ^
+
+error: unexpected token in attribute
+  --> tests/deref_derive/invalid_attribute.fail.rs:11:12
+   |
+11 |     #[deref()]
+   |            ^

crates/bevy_macros_compile_fail_tests/tests/deref_derive/invalid_item.fail.rs

@@ -0,0 +1,9 @@
+use bevy_derive::Deref;
+
+#[derive(Deref)]
+struct UnitStruct;
+
+#[derive(Deref)]
+enum Enum {}
+
+fn main() {}

crates/bevy_macros_compile_fail_tests/tests/deref_derive/invalid_item.fail.stderr

@@ -0,0 +1,15 @@
+error: Deref cannot be derived on field-less structs
+ --> tests/deref_derive/invalid_item.fail.rs:3:10
+  |
+3 | #[derive(Deref)]
+  |          ^^^^^
+  |
+  = note: this error originates in the derive macro `Deref` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: Deref can only be derived on structs
+ --> tests/deref_derive/invalid_item.fail.rs:6:10
+  |
+6 | #[derive(Deref)]
+  |          ^^^^^
+  |
+  = note: this error originates in the derive macro `Deref` (in Nightly builds, run with -Z macro-backtrace for more info)

crates/bevy_macros_compile_fail_tests/tests/deref_derive/missing_attribute.fail.rs

@@ -0,0 +1,12 @@
+use bevy_derive::Deref;
+
+#[derive(Deref)]
+struct TupleStruct(usize, String);
+
+#[derive(Deref)]
+struct Struct {
+    foo: usize,
+    bar: String,
+}
+
+fn main() {}