added serialize_none_as_null for separate fields also

not-fl3 · Sep 14, 2024 · 0902b6d · 0902b6d
1 parent 0a4fccc
commit 0902b6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/derive/src/serde_json.rs b/derive/src/serde_json.rs
@@ -58,8 +58,9 @@ pub fn derive_ser_json_struct(struct_: &Struct) -> TokenStream {
 
             if field.ty.base() == "Option" {
                 let proxy_attr = crate::shared::attrs_proxy(&field.attributes);
-                let serialize_none_as_null_attr = shared::attrs_serialize_none_as_null(&struct_.attributes);
-                let null_on_none = serialize_none_as_null_attr && proxy_attr.is_none();
+                let struct_null_on_none = shared::attrs_serialize_none_as_null(&struct_.attributes);
+                let field_null_on_none = shared::attrs_serialize_none_as_null(&field.attributes);
+                let null_on_none = (field_null_on_none || struct_null_on_none) && proxy_attr.is_none();
                 let field_header = &format!("if first_field_was_serialized {{
                                                  s.conl();
                                              }};

diff --git a/tests/json.rs b/tests/json.rs
@@ -345,6 +345,17 @@ fn ser_none_as_null() {
     let b = Foo2 { x: None };
 
     assert_eq!(SerJson::serialize_json(&b), r#"{"x":null}"#);
+
+    #[derive(SerJson)]
+    struct Foo3 {
+        x: Option<i32>,
+        #[nserde(serialize_none_as_null)]
+        y: Option<i32>,
+    }
+
+    let b = Foo3 { x: None, y: None };
+
+    assert_eq!(SerJson::serialize_json(&b), r#"{"y":null}"#);
 }
 
 #[test]