fix nesting with other features (#100)

add nesting test for std,merge,none_as_default,keep_none features
fix nesting with other features

Author: yanganto

.github/workflows/test.yml

@@ -38,22 +38,27 @@ jobs:
           nix develop -c cargo run --features=std --example rename-patch-struct
           nix develop -c cargo run --features=std --example patch-attr
           nix develop -c cargo run --features=std --example option
+          nix develop -c cargo run --features=std,nesting --example nesting
           nix develop -c cargo test --features=std
 
       - name: Test with merge features
         run: |
           nix develop -c cargo run --features=option --features=merge --example option
           nix develop -c cargo run --features=merge --example op
+          nix develop -c cargo run --features=merge,nesting --example nesting
           nix develop -c cargo test --features=merge --no-default-features
           nix develop -c cargo test --features=merge
 
       - name: Test with option features
         run: |
           nix develop -c cargo run --features=none_as_default --example option
+          nix develop -c cargo run --features=none_as_default,nesting --example nesting
           nix develop -c cargo run --features=keep_none --example option
+          nix develop -c cargo run --features=keep_none,nesting --example nesting
 
       - name: Test with default features
         run: |
           nix develop -c cargo run --example status
           nix develop -c cargo run --example op
+          nix develop -c cargo run --features=nesting --example nesting
           nix develop -c cargo test

Cargo.toml

@@ -7,7 +7,7 @@ members = [
 
 [workspace.package]
 authors = ["Antonio Yang <yanganto@gmail.com>"]
-version = "0.10.1"
+version = "0.10.2"
 edition = "2021"
 categories = ["development-tools"]
 keywords = ["struct", "patch", "macro", "derive", "overlay"]

struct-patch-derive/src/patch.rs

@@ -163,7 +163,7 @@ impl Patch {
                             #original_field_names: other.#original_field_names.or(self.#original_field_names),
                         )*
                         #(
-                            #nesting_field_names: other.#nesting_field_names.apply(self.#nesting_field_names),
+                            #nesting_field_names: other.#nesting_field_names.merge(self.#nesting_field_names),
                         )*
                     }
                 }
@@ -228,6 +228,9 @@ impl Patch {
                                 (None, None) => None,
                             },
                         )*
+                        #(
+                            #nesting_field_names: self.#nesting_field_names + rhs.#nesting_field_names,
+                        )*
                     }
                 }
             }
@@ -277,6 +280,9 @@ impl Patch {
                                 (None, None) => None,
                             },
                         )*
+                        #(
+                            #nesting_field_names: self.#nesting_field_names + rhs.#nesting_field_names,
+                        )*
                     }
                 }
             }

struct-patch/Cargo.toml

@@ -11,7 +11,7 @@ license.workspace = true
 readme.workspace = true
 
 [dependencies]
-struct-patch-derive = { version = "=0.10.1", path = "../struct-patch-derive" }
+struct-patch-derive = { version = "=0.10.2", path = "../struct-patch-derive" }
 
 [dev-dependencies]
 serde_json = "1.0"

struct-patch/examples/nesting.rs

@@ -34,7 +34,7 @@ fn main() {
         ..Default::default()
     };
 
-    let patch = item_b.clone().into_patch_by_diff(item_a);
+    let patch: ItemPatch = item_b.clone().into_patch_by_diff(item_a);
     assert_eq!(
         format!("{patch:?}"),
         "ItemPatch { field_complete: None, field_int: Some(7), field_string: None, inner: NestingPatch { inner_int: Some(100), inner_string: None } }"