From 20aae33c803ec308756883fa035497c53f57fb22 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Tue, 20 Nov 2018 14:11:37 +0100 Subject: [PATCH] fix de-ser of option of struct --- yaserde/tests/der_option.rs | 2 +- yaserde/tests/se_option.rs | 2 +- yaserde_derive/src/ser/expand_struct.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yaserde/tests/der_option.rs b/yaserde/tests/der_option.rs index 1e20085..3515f57 100644 --- a/yaserde/tests/der_option.rs +++ b/yaserde/tests/der_option.rs @@ -137,6 +137,6 @@ fn de_option_struct() { } } - convert_and_validate!(Test, Some(Test{field: SubTest{content: Some("value".to_string())}}), Some("value")); + convert_and_validate!(Test, Some(Test{field: SubTest{content: Some("value".to_string())}}), Some("value")); convert_and_validate!(Test, None, None); } diff --git a/yaserde/tests/se_option.rs b/yaserde/tests/se_option.rs index 15bbfaa..362ebe4 100644 --- a/yaserde/tests/se_option.rs +++ b/yaserde/tests/se_option.rs @@ -140,6 +140,6 @@ fn de_option_struct() { } } - convert_and_validate!(Test, Some(Test{field: SubTest{content: Some("value".to_string())}}), Some("value")); + convert_and_validate!(Test, Some(Test{field: SubTest{content: Some("value".to_string())}}), Some("value")); convert_and_validate!(Test, None, None); } diff --git a/yaserde_derive/src/ser/expand_struct.rs b/yaserde_derive/src/ser/expand_struct.rs index f8d9917..8802d5d 100644 --- a/yaserde_derive/src/ser/expand_struct.rs +++ b/yaserde_derive/src/ser/expand_struct.rs @@ -265,7 +265,7 @@ pub fn serialize( let start_event = XmlEvent::start_element(#label_name); let _ret = writer.write(start_event); - writer.set_skip_start_end(false); + writer.set_skip_start_end(true); match item.serialize(writer) { Ok(()) => {}, Err(msg) => {