From c34f44e1e7d7d1f4d2abf15529bad1632d058426 Mon Sep 17 00:00:00 2001
From: JoJoJet <21144246+JoJoJet@users.noreply.github.com>
Date: Wed, 14 Dec 2022 18:17:06 -0500
Subject: [PATCH] support deriving tuple and unit struct `SystemParam`s

---
 crates/bevy_ecs/macros/src/lib.rs          | 20 ++++++++++++++------
 crates/bevy_ecs/src/system/system_param.rs |  8 +++++++-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs
index b8674daf0095f..6256c03b0d391 100644
--- a/crates/bevy_ecs/macros/src/lib.rs
+++ b/crates/bevy_ecs/macros/src/lib.rs
@@ -327,13 +327,14 @@ static SYSTEM_PARAM_ATTRIBUTE_NAME: &str = "system_param";
 #[proc_macro_derive(SystemParam, attributes(system_param))]
 pub fn derive_system_param(input: TokenStream) -> TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
-    let fields = match get_named_struct_fields(&ast.data) {
-        Ok(fields) => &fields.named,
-        Err(e) => return e.into_compile_error().into(),
+    let syn::Data::Struct(syn::DataStruct { fields: field_definitions, ..}) = ast.data else {
+        return syn::Error::new(ast.span(), "Invalid `SystemParam` type: expected a `struct`")
+            .into_compile_error()
+            .into();
     };
     let path = bevy_ecs_path();
 
-    let field_attributes = fields
+    let field_attributes = field_definitions
         .iter()
         .map(|field| {
             (
@@ -368,9 +369,16 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
             ignored_fields.push(field.ident.as_ref().unwrap());
             ignored_field_types.push(&field.ty);
         } else {
-            fields.push(field.ident.as_ref().unwrap());
+            let i = Index::from(i);
+            fields.push(
+                field
+                    .ident
+                    .as_ref()
+                    .map(|f| quote! { #f })
+                    .unwrap_or_else(|| quote! { #i }),
+            );
             field_types.push(&field.ty);
-            field_indices.push(Index::from(i));
+            field_indices.push(i);
         }
     }
 
diff --git a/crates/bevy_ecs/src/system/system_param.rs b/crates/bevy_ecs/src/system/system_param.rs
index 63f356c4b592c..e2309d09a2875 100644
--- a/crates/bevy_ecs/src/system/system_param.rs
+++ b/crates/bevy_ecs/src/system/system_param.rs
@@ -1662,5 +1662,11 @@ mod tests {
     }
 
     #[derive(SystemParam)]
-    pub struct UnitParam {}
+    pub struct UnitParam;
+
+    #[derive(SystemParam)]
+    pub struct TupleParam<'w, 's, R: Resource, L: FromWorld + Send + 'static>(
+        Res<'w, R>,
+        Local<'s, L>,
+    );
 }