From 61f9badbe709f8f056ffca024171a9d158523d8f Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Tue, 10 Apr 2018 11:22:18 +0200 Subject: [PATCH] move attributes to common part --- yaserde_derive/src/{de => }/attribute.rs | 2 -- yaserde_derive/src/de/expand_struct.rs | 2 +- yaserde_derive/src/de/mod.rs | 2 +- yaserde_derive/src/lib.rs | 1 + yaserde_derive/src/ser/expand_struct.rs | 2 +- yaserde_derive/src/ser/mod.rs | 4 +--- 6 files changed, 5 insertions(+), 8 deletions(-) rename yaserde_derive/src/{de => }/attribute.rs (99%) diff --git a/yaserde_derive/src/de/attribute.rs b/yaserde_derive/src/attribute.rs similarity index 99% rename from yaserde_derive/src/de/attribute.rs rename to yaserde_derive/src/attribute.rs index 996b915..3830548 100644 --- a/yaserde_derive/src/de/attribute.rs +++ b/yaserde_derive/src/attribute.rs @@ -28,9 +28,7 @@ fn get_value(iter: &mut TokenTreeIter) -> Option { } impl YaSerdeAttribute { - pub fn parse(attrs: &Vec) -> YaSerdeAttribute { - let mut root = None; let mut rename = None; let mut attribute = false; diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index 6bca28e..a6cbe12 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/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; diff --git a/yaserde_derive/src/de/mod.rs b/yaserde_derive/src/de/mod.rs index 5392c83..54190fb 100644 --- a/yaserde_derive/src/de/mod.rs +++ b/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; diff --git a/yaserde_derive/src/lib.rs b/yaserde_derive/src/lib.rs index 7191b10..ec60a28 100644 --- a/yaserde_derive/src/lib.rs +++ b/yaserde_derive/src/lib.rs @@ -6,6 +6,7 @@ extern crate proc_macro2; extern crate quote; extern crate syn; +mod attribute; mod de; mod ser; diff --git a/yaserde_derive/src/ser/expand_struct.rs b/yaserde_derive/src/ser/expand_struct.rs index ef18d93..3e4a5db 100644 --- a/yaserde_derive/src/ser/expand_struct.rs +++ b/yaserde_derive/src/ser/expand_struct.rs @@ -1,5 +1,5 @@ -use de::attribute::*; +use attribute::*; use de::field_type::*; use quote::Tokens; use syn::Ident; diff --git a/yaserde_derive/src/ser/mod.rs b/yaserde_derive/src/ser/mod.rs index ffc75ca..c565613 100644 --- a/yaserde_derive/src/ser/mod.rs +++ b/yaserde_derive/src/ser/mod.rs @@ -1,9 +1,7 @@ -// pub mod attribute; pub mod expand_struct; -// pub mod field_type; -use de::attribute; +use attribute; use proc_macro2::Span; use quote;