move attributes to common part

yaserde_derive/src/de/attribute.rs

@@ -1,84 +0,0 @@
-
-use proc_macro2::TokenTreeIter;
-use proc_macro2::TokenNode::*;
-use proc_macro2::Spacing;
-use proc_macro2::Delimiter::Parenthesis;
-use syn::Attribute;
-
-#[derive(Debug, Clone)]
-pub struct YaSerdeAttribute {
-  pub root: Option<String>,
-  pub rename: Option<String>,
-  pub attribute: bool,
-  pub text: bool,
-}
-
-fn get_value(iter: &mut TokenTreeIter) -> Option<String> {
-  match (iter.next(), iter.next()) {
-    (Some(operator), Some(value)) => {
-      match (operator.kind, value.kind) {
-        (Op('=', Spacing::Alone), Literal(l)) => {
-          Some(l.to_string().replace("\"", ""))
-        },
-        _ => None,
-      }
-    },
-    _ => None,
-  }
-}
-
-impl YaSerdeAttribute {
-
-  pub fn parse(attrs: &Vec<Attribute>) -> YaSerdeAttribute {
-
-    let mut root = None;
-    let mut rename = None;
-    let mut attribute = false;
-    let mut text = false;
-
-    for attr in attrs.iter() {
-      let mut attr_iter = attr.clone().tts.into_iter();
-      match attr_iter.next() {
-        Some(token) => {
-          match token.kind {
-            Group(Parenthesis, token_stream) => {
-              let mut attr_iter = token_stream.into_iter();
-
-              while let Some(item) = attr_iter.next() {
-                match item.kind {
-                  Term(t) => {
-                    match t.as_str() {
-                      "root" => {
-                        root = get_value(&mut attr_iter);
-                      },
-                      "rename" => {
-                        rename = get_value(&mut attr_iter);
-                      },
-                      "attribute" => {
-                        attribute = true;
-                      }
-                      "text" => {
-                        text = true;
-                      }
-                      _ => {},
-                    }
-                  },
-                  _ => {}
-                }
-              }
-            },
-            _ => {},
-          }
-        },
-        None => {},
-      }
-    }
-
-    YaSerdeAttribute {
-      root: root,
-      rename: rename,
-      attribute: attribute,
-      text: text,
-    }
-  }
-}

yaserde_derive/src/de/expand_struct.rs

@@ -1,5 +1,5 @@
 
-use de::attribute::*;
+use attribute::*;
 use de::field_type::*;
 use quote::Tokens;
 use syn::Ident;

yaserde_derive/src/de/mod.rs

@@ -1,8 +1,8 @@
 
-pub mod attribute;
 pub mod expand_struct;
 pub mod field_type;
 
+use attribute;
 use proc_macro2::Span;
 use quote;
 use syn;