Use TypeWithGenerics in EvaluatedCheckEntry

Author: soareschen

crates/macros/cgp-macro-core/src/types/check_components/entry.rs

@@ -2,8 +2,7 @@ use syn::parse::{Parse, ParseStream};
 use syn::spanned::Spanned;
 use syn::token::Colon;
 
-use crate::types::check_components::{CheckKey, CheckValue, EvaluatedCheckEntry};
-use crate::types::generics::ImplGenerics;
+use crate::types::check_components::{CheckKey, CheckValue, EvaluatedCheckEntry, TypeWithGenerics};
 
 pub struct CheckEntry {
     pub key: CheckKey,
@@ -24,10 +23,9 @@ impl CheckEntry {
 
                 if values.is_empty() {
                     entries.push(EvaluatedCheckEntry {
-                        component_type: component_type.clone(),
-                        component_params: None,
+                        key: component_type.clone(),
+                        value: None,
                         span: component_type.span(),
-                        generics: ImplGenerics::default(),
                     })
                 } else {
                     let component_params_count = values.len();
@@ -43,19 +41,20 @@ impl CheckEntry {
                         };
 
                         entries.push(EvaluatedCheckEntry {
-                            component_type: component_type.clone(),
-                            component_params: Some(component_param_type.clone()),
+                            key: component_type.clone(),
+                            value: Some(TypeWithGenerics {
+                                ty: component_param_type.clone(),
+                                generics: component_param_generics.clone(),
+                            }),
                             span,
-                            generics: component_param_generics.clone(),
                         })
                     }
                 }
             } else {
                 entries.push(EvaluatedCheckEntry {
-                    component_type: component_type.clone(),
-                    component_params: None,
+                    key: component_type.clone(),
+                    value: None,
                     span: component_type.span(),
-                    generics: ImplGenerics::default(),
                 })
             }
         }

crates/macros/cgp-macro-core/src/types/check_components/evaluated_check_entry.rs

@@ -1,11 +1,10 @@
 use proc_macro2::Span;
 use syn::Type;
 
-use crate::types::generics::ImplGenerics;
+use crate::types::check_components::TypeWithGenerics;
 
 pub struct EvaluatedCheckEntry {
-    pub component_type: Type,
-    pub component_params: Option<Type>,
+    pub key: Type,
+    pub value: Option<TypeWithGenerics>,
     pub span: Span,
-    pub generics: ImplGenerics,
 }

crates/macros/cgp-macro-lib/src/check_components/derive.rs

@@ -1,5 +1,7 @@
 use cgp_macro_core::functions::merge_generics;
-use cgp_macro_core::types::check_components::{CheckComponentsTable, EvaluatedCheckEntry};
+use cgp_macro_core::types::check_components::{
+    CheckComponentsTable, EvaluatedCheckEntry, TypeWithGenerics,
+};
 use quote::quote;
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
@@ -27,22 +29,26 @@ pub fn derive_check_components(
     })?;
 
     for EvaluatedCheckEntry {
-        component_type,
-        component_params,
+        key: component_type,
+        value: component_params,
         span,
-        generics: check_generics,
     } in spec.check_entries.eval()
     {
         // Override the span of the context type so that any unsatisfied constraint
         // error is highlighted on the component type instead
         let context_type = override_span(&span, context_type)?;
 
-        let component_param = component_params.as_ref().unwrap_or(&unit);
+        let TypeWithGenerics {
+            ty: component_param,
+            generics: check_generics,
+        } = component_params.unwrap_or_else(|| unit.clone().into());
 
         let generics = merge_generics(&check_generics.generics, &impl_generics.generics);
 
+        let impl_generics = generics.split_for_impl().0;
+
         let item_impl: ItemImpl = parse2(quote! {
-            impl #generics
+            impl #impl_generics
                 #trait_name < #component_type, #component_param >
                 for #context_type
             #where_clause
@@ -72,12 +78,18 @@ pub fn derive_check_provider(
     })?;
 
     for EvaluatedCheckEntry {
-        component_type,
-        component_params,
+        key: component_type,
+        value: component_params,
         ..
     } in spec.check_entries.eval()
     {
-        let component_param = component_params.as_ref().unwrap_or(&unit);
+        let TypeWithGenerics {
+            ty: component_param,
+            generics: check_generics,
+        } = component_params.unwrap_or_else(|| unit.clone().into());
+
+        let generics = merge_generics(&check_generics.generics, &impl_generics.generics);
+        let impl_generics = generics.split_for_impl().0;
 
         for provider in providers {
             let item_impl: ItemImpl = parse2(quote! {