fix for &str

Ten0 · Mar 10, 2024 · 886ecb2 · 886ecb2
1 parent 0348c36
commit 886ecb2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/serde_avro_derive/src/lib.rs b/serde_avro_derive/src/lib.rs
@@ -71,7 +71,7 @@ impl SchemaBuilder {
 		idx
 	}
 
-	pub fn find_or_build<T: BuildSchema>(&mut self) -> SchemaKey {
+	pub fn find_or_build<T: BuildSchema + ?Sized>(&mut self) -> SchemaKey {
 		match self
 			.already_built_types
 			.entry(TypeId::of::<T::TypeLookup>())

diff --git a/serde_avro_derive/tests/basic.rs → serde_avro_derive/tests/derive_schema.rs b/serde_avro_derive/tests/basic.rs → serde_avro_derive/tests/derive_schema.rs
@@ -20,7 +20,7 @@ fn primitives() {
 	test::<Bar>(
 		r#"{
   "type": "record",
-  "name": "basic.Bar",
+  "name": "derive_schema.Bar",
   "fields": [
     {
       "name": "a",
@@ -46,7 +46,7 @@ fn substruct() {
 	test::<Foo>(
 		r#"{
   "type": "record",
-  "name": "basic.Foo",
+  "name": "derive_schema.Foo",
   "fields": [
     {
       "name": "primitives",
@@ -83,7 +83,7 @@ fn complex() {
 	test::<Complex>(
 		r#"{
   "type": "record",
-  "name": "basic.Complex",
+  "name": "derive_schema.Complex",
   "fields": [
     {
       "name": "s1",
@@ -132,14 +132,15 @@ fn complex() {
 struct Generics<'a, F> {
 	s1: F,
 	s2: &'a F,
+	s: &'a str,
 }
 
 #[test]
 fn generics() {
 	test::<Generics<'_, Bar>>(
 		r#"{
   "type": "record",
-  "name": "basic.Generics_be632cb05c10a877",
+  "name": "derive_schema.Generics_62462e653c3a8376",
   "fields": [
     {
       "name": "s1",
@@ -161,6 +162,10 @@ fn generics() {
     {
       "name": "s2",
       "type": "Bar"
+    },
+    {
+      "name": "s",
+      "type": "string"
     }
   ]
 }"#,

diff --git a/serde_avro_derive_macros/src/schema.rs b/serde_avro_derive_macros/src/schema.rs
@@ -79,9 +79,8 @@ pub(crate) fn schema_impl(input: SchemaDeriveInput) -> Result<TokenStream, Error
 			// 'static otherwise it won't implement `Any`, so we need to generate a
 			// dedicated struct for it.
 			let type_lookup_ident = format_ident!("{ident}TypeLookup");
-			let type_params: Vec<syn::Ident> = (0..generics.params.len())
-				.map(|i| format_ident!("T{}", i))
-				.collect();
+			let type_params: Vec<syn::Ident> =
+				(0..fields.len()).map(|i| format_ident!("T{}", i)).collect();
 			let struct_decl = syn::ItemStruct {
 				attrs: Default::default(),
 				vis: syn::Visibility::Inherited,