use anytime FieldType methods

yaserde_derive/src/de/expand_struct.rs

@@ -4,45 +4,29 @@ use field_type::*;
 use quote::Tokens;
 use syn::Ident;
 use syn::DataStruct;
-use syn::punctuated::Pair;
-use syn::Type::Path;
 use proc_macro2::Span;
 
 pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
   let variables : Tokens = data_struct.fields.iter().map(|ref field|
     {
       let label = field.ident;
-
-      match field.ty {
-        Path(ref path) => {
-          match path.path.segments.first() {
-            Some(Pair::End(t)) => {
-              let pair = path.path.segments.first().unwrap();
-
-              match t.ident.to_string().as_str() {
-                "String" => {
+      match get_field_type(field) {
+        Some(FieldType::FieldTypeString) => {
           Some(quote!{
-                    let mut #label : #pair = "".to_string();
+            let mut #label : String = "".to_string();
           })
         },
-                "Vec" => {
+        Some(FieldType::FieldTypeVec{data_type}) => {
           Some(quote!{
-                    let mut #label : #pair = vec![];
+            let mut #label : Vec<#data_type> = vec![];
           })
         },
-                _ => {
+        Some(FieldType::FieldTypeStruct{struct_name}) => {
           Some(quote!{
-                    let mut #label : #pair = #pair::default();
+            let mut #label : #struct_name = #struct_name::default();
           })
-                },
         }
-            },
-            _ => {
-              None
-            },
-          }
-        },
-        _ => {None},
+        _ => None
       }
     })
     .filter(|x| x.is_some())
@@ -142,8 +126,8 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
             },
           })
         },
-        Some(FieldType::FieldTypeStruct{name}) => {
-          let struct_ident = Ident::new(&format!("{}", name), Span::def_site());
+        Some(FieldType::FieldTypeStruct{struct_name}) => {
+          let struct_ident = Ident::new(&format!("{}", struct_name), Span::def_site());
 
           Some(quote!{
             #label_name => {
@@ -159,10 +143,8 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
             },
           })
         },
-        Some(FieldType::FieldTypeVec) => {
-          match get_vec_type(field) {
-            Some(identifier) => {
-              match identifier.to_string().as_str() {
+        Some(FieldType::FieldTypeVec{data_type}) => {
+          match data_type.to_string().as_str() {
             "String" => {
               Some(quote!{
                 #label_name => {
@@ -193,9 +175,6 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
             }
           }
         },
-            None => None
-          }
-        },
         _ => None
       }
     })
@@ -210,7 +189,7 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
       match get_field_type(field) {
         Some(FieldType::FieldTypeString) |
         Some(FieldType::FieldTypeStruct{..}) |
-        Some(FieldType::FieldTypeVec) =>
+        Some(FieldType::FieldTypeVec{..}) =>
           Some(quote!{
             #label: #label,
           }),

yaserde_derive/src/field_type.rs

@@ -6,8 +6,8 @@ use syn::Type::Path;
 #[derive(Debug)]
 pub enum FieldType {
   FieldTypeString,
-  FieldTypeVec,
-  FieldTypeStruct{name: String},
+  FieldTypeVec{data_type: syn::Ident},
+  FieldTypeStruct{struct_name: syn::Ident},
 }
 
 pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
@@ -17,8 +17,19 @@ pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
         Some(Pair::End(t)) => {
           match t.ident.to_string().as_str() {
             "String" => Some(FieldType::FieldTypeString),
-            "Vec" => Some(FieldType::FieldTypeVec),
-            name => Some(FieldType::FieldTypeStruct{name: name.to_string()}),
+            "Vec" => {
+              match get_vec_type(t) {
+                Some(data_type) =>
+                  Some(FieldType::FieldTypeVec{
+                    data_type: data_type
+                  }),
+                None => None,
+              }
+            },
+            _struct_name =>
+              Some(FieldType::FieldTypeStruct{
+                struct_name: t.ident
+              }),
           }
         },
         _ => {
@@ -30,11 +41,7 @@ pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
   }
 }
 
-pub fn get_vec_type(field: &syn::Field) -> Option<syn::Ident> {
-  match field.ty {
-    Path(ref path) => {
-      match path.path.segments.first() {
-        Some(Pair::End(t)) => {
+fn get_vec_type(t: &syn::PathSegment) -> Option<syn::Ident> {
   match t.arguments {
     syn::PathArguments::AngleBracketed(ref args) => {
       match args.args.first() {
@@ -61,10 +68,4 @@ pub fn get_vec_type(field: &syn::Field) -> Option<syn::Ident> {
     },
     _ => None
   }
-        },
-        _ => None
-      }
-    }
-    _ => None
-  }
 }

yaserde_derive/src/ser/expand_struct.rs

@@ -75,7 +75,7 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
               },
             };
           }),
-        Some(FieldType::FieldTypeVec) =>
+        Some(FieldType::FieldTypeVec{..}) =>
           Some(quote!{
             for item in &self.#label {
               let start_event = XmlEvent::start_element(#label_name);