Merge pull request #31 from MrGVSV/fix-generics

Fix generics with `#[schematic(asset)]`
MrGVSV · Apr 28, 2023 · a0f4e22 · a0f4e22
2 parents 5701889 + 8182fa4
commit a0f4e22
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,6 +70,7 @@ serde_yaml = { version = "0.9", optional = true, default-features = false }
 ron = "0.8"
 bevy = "0.10.1"
 bevy_prototype_lyon = "0.8.0"
+trybuild = "1.0.71"
 
 [[example]]
 name = "basic_schematic"
@@ -110,3 +111,7 @@ required-features = ["ron", "auto_name"]
 name = "templates"
 path = "examples/templates.rs"
 required-features = ["ron", "auto_name", "custom_schematics", "bevy_sprite", "yaml"]
+
+[[test]]
+name = "compile_tests"
+path = "tests/compile_tests.rs"
diff --git a/bevy_proto_derive/Cargo.toml b/bevy_proto_derive/Cargo.toml
@@ -22,4 +22,5 @@ syn = "2.0"
 quote = "1.0"
 proc-macro2 = "1.0"
 proc-macro-crate = "1.3"
-optional-error = "0.1"
+optional-error = "0.1"
+to_phantom = "0.1"
diff --git a/bevy_proto_derive/src/schematic/derive.rs b/bevy_proto_derive/src/schematic/derive.rs
@@ -132,7 +132,8 @@ impl DeriveSchematic {
 
                 Some(quote! {
                     match #INPUT_IDENT {
-                        #(#arms),*
+                        #(#arms,)*
+                        _ => unreachable!(),
                     }
                 })
             }

diff --git a/bevy_proto_derive/src/schematic/input.rs b/bevy_proto_derive/src/schematic/input.rs
@@ -2,6 +2,7 @@ use proc_macro2::{Ident, Span, TokenStream};
 use quote::{format_ident, quote, ToTokens};
 use syn::token::Pub;
 use syn::{Generics, Token, TypePath, Visibility};
+use to_phantom::ToPhantom;
 
 use crate::schematic::data::SchematicData;
 use crate::schematic::fields::SchematicField;
@@ -120,6 +121,7 @@ impl<'a> ToTokens for Input<'a> {
         let input_ty = quote!(#input_ident #impl_ty_generics);
         // Ex: Foo<T: Bar>
         let input_ty_def = quote!(#input_ident #impl_generics);
+        let phantom_ty = self.generics.to_phantom();
 
         let make_from_impl = |body: TokenStream| {
             quote! {
@@ -158,7 +160,9 @@ impl<'a> ToTokens for Input<'a> {
                 tokens.extend(quote! {
                     #[derive(#bevy_crate::prelude::Reflect, #bevy_crate::prelude::FromReflect)]
                     #vis struct #input_ty_def (
-                        #(#filtered),*
+                        #(#filtered,)*
+                        #[reflect(ignore, default)]
+                        #phantom_ty
                     ) #where_clause;
 
                     #from_impl
@@ -178,7 +182,9 @@ impl<'a> ToTokens for Input<'a> {
                 tokens.extend(quote! {
                     #[derive(#bevy_crate::prelude::Reflect, #bevy_crate::prelude::FromReflect)]
                     #vis struct #input_ty_def #where_clause {
-                        #(#filtered),*
+                        #(#filtered,)*
+                        #[reflect(ignore, default)]
+                        __phantom_ty__: #phantom_ty
                     }
 
                     #from_impl
@@ -191,14 +197,16 @@ impl<'a> ToTokens for Input<'a> {
 
                 let from_impl = make_from_impl(quote! {
                     match #INPUT_IDENT {
-                        #(#constructors),*
+                        #(#constructors,)*
+                        _ => unreachable!(),
                     }
                 });
 
                 tokens.extend(quote! {
                     #[derive(#bevy_crate::prelude::Reflect, #bevy_crate::prelude::FromReflect)]
                     #vis enum #input_ty_def #where_clause {
-                        #(#variants),*
+                        #(#variants,)*
+                        _Phantom(#[reflect(ignore, default)] #phantom_ty)
                     }
 
                     #from_impl

diff --git a/tests/compile_tests.rs b/tests/compile_tests.rs
@@ -0,0 +1,6 @@
+#[test]
+fn test() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/compile_tests/*.fail.rs");
+    t.pass("tests/compile_tests/*.pass.rs");
+}
diff --git a/tests/compile_tests/generics.pass.rs b/tests/compile_tests/generics.pass.rs
@@ -0,0 +1,36 @@
+use bevy::asset::Asset;
+use bevy::prelude::*;
+use bevy_proto::prelude::*;
+use std::borrow::Cow;
+
+#[derive(Component, Schematic, Reflect)]
+#[reflect(Schematic)]
+struct TupleStructWithGenerics<'a: 'static, T: Asset, const N: usize>(
+    #[schematic(asset)] Handle<T>,
+    Cow<'a, str>,
+    [i32; N],
+);
+
+#[derive(Component, Schematic, Reflect)]
+#[reflect(Schematic)]
+struct StructWithGenerics<'a: 'static, T: Asset, const N: usize> {
+    #[schematic(asset)]
+    asset: Handle<T>,
+    string: Cow<'a, str>,
+    array: [i32; N],
+}
+
+#[derive(Component, Schematic, Reflect)]
+#[reflect(Schematic)]
+enum EnumWithGenerics<'a: 'static, T: Asset, const N: usize> {
+    Unit,
+    Tuple(#[schematic(asset)] Handle<T>, Cow<'a, str>, [i32; N]),
+    Struct {
+        #[schematic(asset)]
+        asset: Handle<T>,
+        string: Cow<'a, str>,
+        array: [i32; N],
+    },
+}
+
+fn main() {}