Fix Add with generics

yanganto · Aug 9, 2024 · 8559864 · 8559864
1 parent 0ad6210
commit 8559864
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/struct-patch-derive/src/lib.rs b/struct-patch-derive/src/lib.rs
@@ -102,7 +102,7 @@ impl Patch {
 
         #[cfg(feature = "add")]
         let add_impl = quote! {
-            impl core::ops::Add<#name #generics> for #struct_name #generics #where_clause {
+            impl #generics core::ops::Add<#name #generics> for #struct_name #generics #where_clause {
                 type Output = Self;
 
                 fn add(mut self, rhs: #name #generics) -> Self {
@@ -111,10 +111,10 @@ impl Patch {
                 }
             }
 
-            impl core::ops::Add<#struct_name #generics> for #name #generics #where_clause {
+            impl #generics core::ops::Add<#struct_name #generics> for #name #generics #where_clause {
                 type Output = #struct_name #generics;
 
-                fn add(mut self, rhs: #struct_name #generics) -> #struct_name  #where_clause {
+                fn add(mut self, rhs: #struct_name #generics) -> #struct_name #generics {
                     let mut rhs = rhs;
                     rhs.apply(self);
                     rhs

diff --git a/struct-patch/examples/instance.rs b/struct-patch/examples/instance.rs
@@ -35,7 +35,8 @@ fn main() {
     assert_eq!(item.field_int, 7);
     assert_eq!(item.field_string, "");
 
-    #[cfg(feature = "add")] {
+    #[cfg(feature = "add")]
+    {
         let another_patch = ItemPatch {
             field_complete: None,
             field_int: None,