refactoring code to better support

yaserde_derive/src/ser/expand_enum.rs

@@ -75,11 +75,9 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
 
                   match self {
                     &#name::#label{ref #field_label, ..} => {
-                      match #field_label.derive_serialize(writer, true) {
-                        Ok(()) => {},
-                        Err(msg) => {
-                          return Err(msg);
-                        },
+                      writer.set_skip_start_end(true);
+                      if let Err(msg) = #field_label.serialize(writer) {
+                        return Err(msg);
                       };
                     },
                     _ => {}
@@ -96,11 +94,9 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
                         let struct_start_event = XmlEvent::start_element(#field_label_name);
                         let _ret = writer.write(struct_start_event);
 
-                        match item.derive_serialize(writer, true) {
-                          Ok(()) => {},
-                          Err(msg) => {
-                            return Err(msg);
-                          },
+                        writer.set_skip_start_end(true);
+                        if let Err(msg) = item.serialize(writer) {
+                          return Err(msg);
                         };
                         let struct_end_event = XmlEvent::end_element();
                         let _ret = writer.write(struct_end_event);
@@ -142,8 +138,10 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
 
     impl YaSerialize for #name {
       #[allow(unused_variables)]
-      fn derive_serialize<W: Write>(&self, writer: &mut xml::EventWriter<W>, skip_start_end: bool) -> Result<(), String> {
-        if !skip_start_end {
+      fn serialize<W: Write>(&self, writer: &mut yaserde::ser::Serializer<W>) -> Result<(), String> {
+        error!("Enum: start to expand {:?}", #root);
+
+        if !writer.skip_start_end() {
           let struct_start_event = XmlEvent::start_element(#root);
           let _ret = writer.write(struct_start_event);
         }
@@ -152,10 +150,11 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
           #write_enum_content
         }
 
-        if !skip_start_end {
+        if !writer.skip_start_end() {
           let struct_end_event = XmlEvent::end_element();
           let _ret = writer.write(struct_end_event);
         }
+        writer.set_skip_start_end(false);
         Ok(())
       }
     }

yaserde_derive/src/ser/expand_struct.rs

@@ -5,6 +5,7 @@ use quote::Tokens;
 use syn::Ident;
 use syn::DataStruct;
 use proc_macro2::Span;
+use std::string::ToString;
 
 pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
   let build_attributes : Tokens = data_struct.fields.iter().map(|ref field|
@@ -27,7 +28,25 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
           Some(quote!{
             .attr(#label_name, &self.#label)
           }),
-        _ => None
+        Some(FieldType::FieldTypeStruct{struct_name: _struct_name}) =>
+          Some(quote!{
+            .attr(#label_name, &*{
+              use std::mem;
+              match yaserde::ser::to_string_content(&self.#label) {
+                Ok(value) => {
+                  unsafe {
+                    let ret : &'static str = mem::transmute(&value as &str);
+                    mem::forget(value);
+                    ret
+                  }
+                },
+                Err(msg) => return Err("Unable to serialize content".to_owned()),
+              }
+            })
+          }),
+        _ => {
+          None
+        }
       }
     })
     .filter(|x| x.is_some())
@@ -68,7 +87,8 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
           }),
         Some(FieldType::FieldTypeStruct{..}) =>
           Some(quote!{
-            match self.#label.derive_serialize(writer, false) {
+            writer.set_skip_start_end(false);
+            match self.#label.serialize(writer) {
               Ok(()) => {},
               Err(msg) => {
                 return Err(msg);
@@ -95,7 +115,8 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
             Some(&FieldType::FieldTypeStruct{..}) => {
               Some(quote!{
                 for item in &self.#label {
-                  match item.derive_serialize(writer, false) {
+                  writer.set_skip_start_end(false);
+                  match item.serialize(writer) {
                     Ok(()) => {},
                     Err(msg) => {
                       return Err(msg);
@@ -122,15 +143,17 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
 
     impl YaSerialize for #name {
       #[allow(unused_variables)]
-      fn derive_serialize<W: Write>(&self, writer: &mut xml::EventWriter<W>, skip_start_end: bool) -> Result<(), String> {
-        if !skip_start_end {
+      fn serialize<W: Write>(&self, writer: &mut yaserde::ser::Serializer<W>) -> Result<(), String> {
+        error!("Struct: start to expand {:?}", #root);
+
+        if !writer.skip_start_end() {
           let struct_start_event = XmlEvent::start_element(#root)#build_attributes;
           let _ret = writer.write(struct_start_event);
         }
 
         #struct_inspector
 
-        if !skip_start_end {
+        if !writer.skip_start_end() {
           let struct_end_event = XmlEvent::end_element();
           let _ret = writer.write(struct_end_event);
         }

yaserde_derive/src/ser/mod.rs

@@ -3,7 +3,6 @@ pub mod expand_enum;
 pub mod expand_struct;
 
 use attribute;
-
 use proc_macro2::Span;
 use quote;
 use syn;