NationTech/yaserde
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove clippy messages to clean code

Browse Source
This commit is contained in:
Marc-Antoine Arnaud 2018-05-23 17:40:53 +02:00
parent d63e9d27d8
commit c87d0faa02
8 changed files with 180 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
yaserde_derive/src/attribute.rs
View File

@ -26,7 +26,7 @@ fn get_value(iter: &mut TokenTreeIter) -> Option<String> {
} }
impl YaSerdeAttribute { impl YaSerdeAttribute {
pub fn parse(attrs: &Vec<Attribute>) -> YaSerdeAttribute { pub fn parse(attrs: &[Attribute]) -> YaSerdeAttribute {
let mut attribute = false; let mut attribute = false;
let mut namespaces = BTreeMap::new(); let mut namespaces = BTreeMap::new();
let mut prefix = None; let mut prefix = None;
@ -36,59 +36,54 @@ impl YaSerdeAttribute {
for attr in attrs.iter() { for attr in attrs.iter() {
let mut attr_iter = attr.clone().tts.into_iter(); let mut attr_iter = attr.clone().tts.into_iter();
match attr_iter.next() { if let Some(token) = attr_iter.next() {
Some(token) => match token.kind { if let Group(Parenthesis, token_stream) = token.kind {
Group(Parenthesis, token_stream) => { let mut attr_iter = token_stream.into_iter();
let mut attr_iter = token_stream.into_iter();
while let Some(item) = attr_iter.next() { while let Some(item) = attr_iter.next() {
match item.kind { if let Term(term) = item.kind {
Term(t) => match t.as_str() { match term.as_str() {
"attribute" => { "attribute" => {
attribute = true; attribute = true;
} }
"namespace" => { "namespace" => {
if let Some(namespace) = get_value(&mut attr_iter) { if let Some(namespace) = get_value(&mut attr_iter) {
let splitted: Vec<&str> = namespace.split(": ").collect(); let splitted: Vec<&str> = namespace.split(": ").collect();
if splitted.len() == 2 { if splitted.len() == 2 {
namespaces.insert(splitted[0].to_owned(), splitted[1].to_owned()); namespaces.insert(splitted[0].to_owned(), splitted[1].to_owned());
} }
if splitted.len() == 1 { if splitted.len() == 1 {
namespaces.insert("".to_owned(), splitted[0].to_owned()); namespaces.insert("".to_owned(), splitted[0].to_owned());
}
} }
} }
"prefix" => { }
prefix = get_value(&mut attr_iter); "prefix" => {
} prefix = get_value(&mut attr_iter);
"rename" => { }
rename = get_value(&mut attr_iter); "rename" => {
} rename = get_value(&mut attr_iter);
"root" => { }
root = get_value(&mut attr_iter); "root" => {
} root = get_value(&mut attr_iter);
"text" => { }
text = true; "text" => {
} text = true;
_ => {} }
},
_ => {} _ => {}
} }
} }
} }
_ => {} }
},
None => {}
} }
} }
YaSerdeAttribute { YaSerdeAttribute {
attribute: attribute, attribute,
namespaces: namespaces, namespaces,
prefix: prefix, prefix,
rename: rename, rename,
root: root, root,
text: text, text,
} }
} }
} }

46
yaserde_derive/src/de/expand_enum.rs
View File

@ -10,7 +10,7 @@ use proc_macro2::Span;
pub fn parse( pub fn parse(
data_enum: &DataEnum, data_enum: &DataEnum,
name: &Ident, name: &Ident,
root: &String, root: &str,
_namespaces: &BTreeMap<String, String>, _namespaces: &BTreeMap<String, String>,
) -> Tokens { ) -> Tokens {
let variables: Tokens = data_enum let variables: Tokens = data_enum
@ -27,34 +27,34 @@ pub fn parse(
match get_field_type(field) { match get_field_type(field) {
Some(FieldType::FieldTypeString) => { Some(FieldType::FieldTypeString) => {
build_default_value(&field_label, quote!{String}, quote!{"".to_string()}) build_default_value(&field_label, &quote!{String}, &quote!{"".to_string()})
} }
Some(FieldType::FieldTypeBool) => { Some(FieldType::FieldTypeBool) => {
build_default_value(&field_label, quote!{bool}, quote!{false}) build_default_value(&field_label, &quote!{bool}, &quote!{false})
} }
Some(FieldType::FieldTypeI8) => { Some(FieldType::FieldTypeI8) => {
build_default_value(&field_label, quote!{i8}, quote!{0}) build_default_value(&field_label, &quote!{i8}, &quote!{0})
} }
Some(FieldType::FieldTypeU8) => { Some(FieldType::FieldTypeU8) => {
build_default_value(&field_label, quote!{u8}, quote!{0}) build_default_value(&field_label, &quote!{u8}, &quote!{0})
} }
Some(FieldType::FieldTypeI16) => { Some(FieldType::FieldTypeI16) => {
build_default_value(&field_label, quote!{i16}, quote!{0}) build_default_value(&field_label, &quote!{i16}, &quote!{0})
} }
Some(FieldType::FieldTypeU16) => { Some(FieldType::FieldTypeU16) => {
build_default_value(&field_label, quote!{u16}, quote!{0}) build_default_value(&field_label, &quote!{u16}, &quote!{0})
} }
Some(FieldType::FieldTypeI32) => { Some(FieldType::FieldTypeI32) => {
build_default_value(&field_label, quote!{i32}, quote!{0}) build_default_value(&field_label, &quote!{i32}, &quote!{0})
} }
Some(FieldType::FieldTypeU32) => { Some(FieldType::FieldTypeU32) => {
build_default_value(&field_label, quote!{u32}, quote!{0}) build_default_value(&field_label, &quote!{u32}, &quote!{0})
} }
Some(FieldType::FieldTypeI64) => { Some(FieldType::FieldTypeI64) => {
build_default_value(&field_label, quote!{i64}, quote!{0}) build_default_value(&field_label, &quote!{i64}, &quote!{0})
} }
Some(FieldType::FieldTypeU64) => { Some(FieldType::FieldTypeU64) => {
build_default_value(&field_label, quote!{u64}, quote!{0}) build_default_value(&field_label, &quote!{u64}, &quote!{0})
} }
Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut)] #[allow(unused_mut)]
@ -64,34 +64,34 @@ pub fn parse(
let dt = Box::into_raw(data_type); let dt = Box::into_raw(data_type);
match unsafe { dt.as_ref() } { match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => { Some(&FieldType::FieldTypeString) => {
build_default_value(&field_label, quote!{Vec<String>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<String>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeBool) => { Some(&FieldType::FieldTypeBool) => {
build_default_value(&field_label, quote!{Vec<bool>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<bool>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI8) => { Some(&FieldType::FieldTypeI8) => {
build_default_value(&field_label, quote!{Vec<i8>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<i8>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU8) => { Some(&FieldType::FieldTypeU8) => {
build_default_value(&field_label, quote!{Vec<u8>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<u8>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI16) => { Some(&FieldType::FieldTypeI16) => {
build_default_value(&field_label, quote!{Vec<i16>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<i16>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU16) => { Some(&FieldType::FieldTypeU16) => {
build_default_value(&field_label, quote!{Vec<u16>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<u16>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI32) => { Some(&FieldType::FieldTypeI32) => {
build_default_value(&field_label, quote!{Vec<i32>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<i32>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU32) => { Some(&FieldType::FieldTypeU32) => {
build_default_value(&field_label, quote!{Vec<u32>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<u32>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI64) => { Some(&FieldType::FieldTypeI64) => {
build_default_value(&field_label, quote!{Vec<i64>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<i64>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU64) => { Some(&FieldType::FieldTypeU64) => {
build_default_value(&field_label, quote!{Vec<u64>}, quote!{vec![]}) build_default_value(&field_label, &quote!{Vec<u64>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ Some(&FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut)] #[allow(unused_mut)]
@ -274,8 +274,8 @@ pub fn parse(
fn build_default_value( fn build_default_value(
label: &Option<Ident>, label: &Option<Ident>,
field_type: Tokens, field_type: &Tokens,
default: Tokens, default: &Tokens,
) -> Option<Tokens> { ) -> Option<Tokens> {
Some(quote!{ Some(quote!{
#[allow(unused_mut)] #[allow(unused_mut)]

199
yaserde_derive/src/de/expand_struct.rs
View File

@ -9,7 +9,7 @@ use proc_macro2::Span;
pub fn parse( pub fn parse(
data_struct: &DataStruct, data_struct: &DataStruct,
name: &Ident, name: &Ident,
root: &String, root: &str,
namespaces: &BTreeMap<String, String>, namespaces: &BTreeMap<String, String>,
) -> Tokens { ) -> Tokens {
let validate_namespace: Tokens = namespaces let validate_namespace: Tokens = namespaces
@ -43,17 +43,19 @@ pub fn parse(
let label = field.ident; let label = field.ident;
match get_field_type(field) { match get_field_type(field) {
Some(FieldType::FieldTypeString) => { Some(FieldType::FieldTypeString) => {
build_default_value(&label, quote!{String}, quote!{"".to_string()}) build_default_value(&label, &quote!{String}, &quote!{"".to_string()})
} }
Some(FieldType::FieldTypeBool) => build_default_value(&label, quote!{bool}, quote!{false}), Some(FieldType::FieldTypeBool) => {
Some(FieldType::FieldTypeI8) => build_default_value(&label, quote!{i8}, quote!{0}), build_default_value(&label, &quote!{bool}, &quote!{false})
Some(FieldType::FieldTypeU8) => build_default_value(&label, quote!{u8}, quote!{0}), }
Some(FieldType::FieldTypeI16) => build_default_value(&label, quote!{i16}, quote!{0}), Some(FieldType::FieldTypeI8) => build_default_value(&label, &quote!{i8}, &quote!{0}),
Some(FieldType::FieldTypeU16) => build_default_value(&label, quote!{u16}, quote!{0}), Some(FieldType::FieldTypeU8) => build_default_value(&label, &quote!{u8}, &quote!{0}),
Some(FieldType::FieldTypeI32) => build_default_value(&label, quote!{i32}, quote!{0}), Some(FieldType::FieldTypeI16) => build_default_value(&label, &quote!{i16}, &quote!{0}),
Some(FieldType::FieldTypeU32) => build_default_value(&label, quote!{u32}, quote!{0}), Some(FieldType::FieldTypeU16) => build_default_value(&label, &quote!{u16}, &quote!{0}),
Some(FieldType::FieldTypeI64) => build_default_value(&label, quote!{i64}, quote!{0}), Some(FieldType::FieldTypeI32) => build_default_value(&label, &quote!{i32}, &quote!{0}),
Some(FieldType::FieldTypeU64) => build_default_value(&label, quote!{u64}, quote!{0}), Some(FieldType::FieldTypeU32) => build_default_value(&label, &quote!{u32}, &quote!{0}),
Some(FieldType::FieldTypeI64) => build_default_value(&label, &quote!{i64}, &quote!{0}),
Some(FieldType::FieldTypeU64) => build_default_value(&label, &quote!{u64}, &quote!{0}),
Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ Some(FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut, non_snake_case, non_camel_case_types)] #[allow(unused_mut, non_snake_case, non_camel_case_types)]
let mut #label : #struct_name = #struct_name::default(); let mut #label : #struct_name = #struct_name::default();
@ -62,34 +64,34 @@ pub fn parse(
let dt = Box::into_raw(data_type); let dt = Box::into_raw(data_type);
match unsafe { dt.as_ref() } { match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => { Some(&FieldType::FieldTypeString) => {
build_default_value(&label, quote!{Vec<String>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<String>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeBool) => { Some(&FieldType::FieldTypeBool) => {
build_default_value(&label, quote!{Vec<bool>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<bool>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI8) => { Some(&FieldType::FieldTypeI8) => {
build_default_value(&label, quote!{Vec<i8>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<i8>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU8) => { Some(&FieldType::FieldTypeU8) => {
build_default_value(&label, quote!{Vec<u8>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<u8>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI16) => { Some(&FieldType::FieldTypeI16) => {
build_default_value(&label, quote!{Vec<i16>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<i16>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU16) => { Some(&FieldType::FieldTypeU16) => {
build_default_value(&label, quote!{Vec<u16>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<u16>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI32) => { Some(&FieldType::FieldTypeI32) => {
build_default_value(&label, quote!{Vec<i32>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<i32>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU32) => { Some(&FieldType::FieldTypeU32) => {
build_default_value(&label, quote!{Vec<u32>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<u32>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeI64) => { Some(&FieldType::FieldTypeI64) => {
build_default_value(&label, quote!{Vec<i64>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<i64>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeU64) => { Some(&FieldType::FieldTypeU64) => {
build_default_value(&label, quote!{Vec<u64>}, quote!{vec![]}) build_default_value(&label, &quote!{Vec<u64>}, &quote!{vec![]})
} }
Some(&FieldType::FieldTypeStruct { struct_name }) => Some(quote!{ Some(&FieldType::FieldTypeStruct { struct_name }) => Some(quote!{
#[allow(unused_mut)] #[allow(unused_mut)]
@ -129,43 +131,43 @@ pub fn parse(
match get_field_type(field) { match get_field_type(field) {
Some(FieldType::FieldTypeString) => { Some(FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site()); let visitor = Ident::new("visit_str", Span::call_site());
build_declare_visitor(quote!{String}, &visitor, &visitor_label) build_declare_visitor(&quote!{String}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeBool) => { Some(FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site()); let visitor = Ident::new("visit_bool", Span::call_site());
build_declare_visitor(quote!{bool}, &visitor, &visitor_label) build_declare_visitor(&quote!{bool}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeI8) => { Some(FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site()); let visitor = Ident::new("visit_i8", Span::call_site());
build_declare_visitor(quote!{i8}, &visitor, &visitor_label) build_declare_visitor(&quote!{i8}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeU8) => { Some(FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site()); let visitor = Ident::new("visit_u8", Span::call_site());
build_declare_visitor(quote!{u8}, &visitor, &visitor_label) build_declare_visitor(&quote!{u8}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeI16) => { Some(FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site()); let visitor = Ident::new("visit_i16", Span::call_site());
build_declare_visitor(quote!{i16}, &visitor, &visitor_label) build_declare_visitor(&quote!{i16}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeU16) => { Some(FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site()); let visitor = Ident::new("visit_u16", Span::call_site());
build_declare_visitor(quote!{u16}, &visitor, &visitor_label) build_declare_visitor(&quote!{u16}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeI32) => { Some(FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site()); let visitor = Ident::new("visit_i32", Span::call_site());
build_declare_visitor(quote!{i32}, &visitor, &visitor_label) build_declare_visitor(&quote!{i32}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeU32) => { Some(FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site()); let visitor = Ident::new("visit_u32", Span::call_site());
build_declare_visitor(quote!{u32}, &visitor, &visitor_label) build_declare_visitor(&quote!{u32}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeI64) => { Some(FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site()); let visitor = Ident::new("visit_i64", Span::call_site());
build_declare_visitor(quote!{i64}, &visitor, &visitor_label) build_declare_visitor(&quote!{i64}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeU64) => { Some(FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site()); let visitor = Ident::new("visit_u64", Span::call_site());
build_declare_visitor(quote!{u64}, &visitor, &visitor_label) build_declare_visitor(&quote!{u64}, &visitor, &visitor_label)
} }
Some(FieldType::FieldTypeStruct { struct_name }) => { Some(FieldType::FieldTypeStruct { struct_name }) => {
let struct_id = struct_name.to_string(); let struct_id = struct_name.to_string();
@ -193,43 +195,43 @@ pub fn parse(
match unsafe { dt.as_ref() } { match unsafe { dt.as_ref() } {
Some(&FieldType::FieldTypeString) => { Some(&FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site()); let visitor = Ident::new("visit_str", Span::call_site());
build_declare_visitor(quote!{String}, &visitor, &visitor_label) build_declare_visitor(&quote!{String}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeBool) => { Some(&FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site()); let visitor = Ident::new("visit_bool", Span::call_site());
build_declare_visitor(quote!{bool}, &visitor, &visitor_label) build_declare_visitor(&quote!{bool}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeI8) => { Some(&FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site()); let visitor = Ident::new("visit_i8", Span::call_site());
build_declare_visitor(quote!{i8}, &visitor, &visitor_label) build_declare_visitor(&quote!{i8}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeU8) => { Some(&FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site()); let visitor = Ident::new("visit_u8", Span::call_site());
build_declare_visitor(quote!{u8}, &visitor, &visitor_label) build_declare_visitor(&quote!{u8}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeI16) => { Some(&FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site()); let visitor = Ident::new("visit_i16", Span::call_site());
build_declare_visitor(quote!{i16}, &visitor, &visitor_label) build_declare_visitor(&quote!{i16}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeU16) => { Some(&FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site()); let visitor = Ident::new("visit_u16", Span::call_site());
build_declare_visitor(quote!{u16}, &visitor, &visitor_label) build_declare_visitor(&quote!{u16}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeI32) => { Some(&FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site()); let visitor = Ident::new("visit_i32", Span::call_site());
build_declare_visitor(quote!{i32}, &visitor, &visitor_label) build_declare_visitor(&quote!{i32}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeU32) => { Some(&FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site()); let visitor = Ident::new("visit_u32", Span::call_site());
build_declare_visitor(quote!{u32}, &visitor, &visitor_label) build_declare_visitor(&quote!{u32}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeI64) => { Some(&FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site()); let visitor = Ident::new("visit_i64", Span::call_site());
build_declare_visitor(quote!{i64}, &visitor, &visitor_label) build_declare_visitor(&quote!{i64}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeU64) => { Some(&FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site()); let visitor = Ident::new("visit_u64", Span::call_site());
build_declare_visitor(quote!{u64}, &visitor, &visitor_label) build_declare_visitor(&quote!{u64}, &visitor, &visitor_label)
} }
Some(&FieldType::FieldTypeStruct { struct_name }) => { Some(&FieldType::FieldTypeStruct { struct_name }) => {
let struct_ident = Ident::new(&format!("{}", struct_name), Span::def_site()); let struct_ident = Ident::new(&format!("{}", struct_name), Span::def_site());
@ -277,9 +279,9 @@ pub fn parse(
Some(FieldType::FieldTypeString) => { Some(FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site()); let visitor = Ident::new("visit_str", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{String}, &quote!{String},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -288,9 +290,9 @@ pub fn parse(
Some(FieldType::FieldTypeBool) => { Some(FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site()); let visitor = Ident::new("visit_bool", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{bool}, &quote!{bool},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -299,9 +301,9 @@ pub fn parse(
Some(FieldType::FieldTypeI8) => { Some(FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site()); let visitor = Ident::new("visit_i8", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i8}, &quote!{i8},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -310,9 +312,9 @@ pub fn parse(
Some(FieldType::FieldTypeU8) => { Some(FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site()); let visitor = Ident::new("visit_u8", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u8}, &quote!{u8},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -321,9 +323,9 @@ pub fn parse(
Some(FieldType::FieldTypeU16) => { Some(FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site()); let visitor = Ident::new("visit_u16", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u16}, &quote!{u16},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -332,9 +334,9 @@ pub fn parse(
Some(FieldType::FieldTypeI16) => { Some(FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site()); let visitor = Ident::new("visit_i16", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i16}, &quote!{i16},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -343,9 +345,9 @@ pub fn parse(
Some(FieldType::FieldTypeU32) => { Some(FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site()); let visitor = Ident::new("visit_u32", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u32}, &quote!{u32},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -354,9 +356,9 @@ pub fn parse(
Some(FieldType::FieldTypeI32) => { Some(FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site()); let visitor = Ident::new("visit_i32", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i32}, &quote!{i32},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -365,9 +367,9 @@ pub fn parse(
Some(FieldType::FieldTypeU64) => { Some(FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site()); let visitor = Ident::new("visit_u64", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u64}, &quote!{u64},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -376,9 +378,9 @@ pub fn parse(
Some(FieldType::FieldTypeI64) => { Some(FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site()); let visitor = Ident::new("visit_i64", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i64}, &quote!{i64},
&visitor, &visitor,
quote!{= value}, &quote!{= value},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -404,9 +406,9 @@ pub fn parse(
Some(&FieldType::FieldTypeString) => { Some(&FieldType::FieldTypeString) => {
let visitor = Ident::new("visit_str", Span::call_site()); let visitor = Ident::new("visit_str", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{String}, &quote!{String},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -415,9 +417,9 @@ pub fn parse(
Some(&FieldType::FieldTypeBool) => { Some(&FieldType::FieldTypeBool) => {
let visitor = Ident::new("visit_bool", Span::call_site()); let visitor = Ident::new("visit_bool", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{bool}, &quote!{bool},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -426,9 +428,9 @@ pub fn parse(
Some(&FieldType::FieldTypeI8) => { Some(&FieldType::FieldTypeI8) => {
let visitor = Ident::new("visit_i8", Span::call_site()); let visitor = Ident::new("visit_i8", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i8}, &quote!{i8},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -437,9 +439,9 @@ pub fn parse(
Some(&FieldType::FieldTypeU8) => { Some(&FieldType::FieldTypeU8) => {
let visitor = Ident::new("visit_u8", Span::call_site()); let visitor = Ident::new("visit_u8", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u8}, &quote!{u8},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -448,9 +450,9 @@ pub fn parse(
Some(&FieldType::FieldTypeI16) => { Some(&FieldType::FieldTypeI16) => {
let visitor = Ident::new("visit_i16", Span::call_site()); let visitor = Ident::new("visit_i16", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i16}, &quote!{i16},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -459,9 +461,9 @@ pub fn parse(
Some(&FieldType::FieldTypeU16) => { Some(&FieldType::FieldTypeU16) => {
let visitor = Ident::new("visit_u16", Span::call_site()); let visitor = Ident::new("visit_u16", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u16}, &quote!{u16},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -470,9 +472,9 @@ pub fn parse(
Some(&FieldType::FieldTypeI32) => { Some(&FieldType::FieldTypeI32) => {
let visitor = Ident::new("visit_i32", Span::call_site()); let visitor = Ident::new("visit_i32", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i32}, &quote!{i32},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -481,9 +483,9 @@ pub fn parse(
Some(&FieldType::FieldTypeU32) => { Some(&FieldType::FieldTypeU32) => {
let visitor = Ident::new("visit_u32", Span::call_site()); let visitor = Ident::new("visit_u32", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u32}, &quote!{u32},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -492,9 +494,9 @@ pub fn parse(
Some(&FieldType::FieldTypeI64) => { Some(&FieldType::FieldTypeI64) => {
let visitor = Ident::new("visit_i64", Span::call_site()); let visitor = Ident::new("visit_i64", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{i64}, &quote!{i64},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -503,9 +505,9 @@ pub fn parse(
Some(&FieldType::FieldTypeU64) => { Some(&FieldType::FieldTypeU64) => {
let visitor = Ident::new("visit_u64", Span::call_site()); let visitor = Ident::new("visit_u64", Span::call_site());
build_call_visitor( build_call_visitor(
quote!{u64}, &quote!{u64},
&visitor, &visitor,
quote!{.push(value)}, &quote!{.push(value)},
&visitor_label, &visitor_label,
&label, &label,
&label_name, &label_name,
@ -602,52 +604,52 @@ pub fn parse(
match get_field_type(field) { match get_field_type(field) {
Some(FieldType::FieldTypeString) => { Some(FieldType::FieldTypeString) => {
build_set_text_to_value(&field_attrs, &label, quote!{text_content.to_owned()}) build_set_text_to_value(&field_attrs, &label, &quote!{text_content.to_owned()})
} }
Some(FieldType::FieldTypeBool) => build_set_text_to_value( Some(FieldType::FieldTypeBool) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{bool::from_str(text_content).unwrap()}, &quote!{bool::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeI8) => build_set_text_to_value( Some(FieldType::FieldTypeI8) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{i8::from_str(text_content).unwrap()}, &quote!{i8::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeU8) => build_set_text_to_value( Some(FieldType::FieldTypeU8) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{u8::from_str(text_content).unwrap()}, &quote!{u8::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeI16) => build_set_text_to_value( Some(FieldType::FieldTypeI16) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{i16::from_str(text_content).unwrap()}, &quote!{i16::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeU16) => build_set_text_to_value( Some(FieldType::FieldTypeU16) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{u16::from_str(text_content).unwrap()}, &quote!{u16::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeI32) => build_set_text_to_value( Some(FieldType::FieldTypeI32) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{i32::from_str(text_content).unwrap()}, &quote!{i32::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeU32) => build_set_text_to_value( Some(FieldType::FieldTypeU32) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{u32::from_str(text_content).unwrap()}, &quote!{u32::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeI64) => build_set_text_to_value( Some(FieldType::FieldTypeI64) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{i64::from_str(text_content).unwrap()}, &quote!{i64::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeU64) => build_set_text_to_value( Some(FieldType::FieldTypeU64) => build_set_text_to_value(
&field_attrs, &field_attrs,
&label, &label,
quote!{u64::from_str(text_content).unwrap()}, &quote!{u64::from_str(text_content).unwrap()},
), ),
Some(FieldType::FieldTypeStruct { .. }) | Some(FieldType::FieldTypeVec { .. }) | None => { Some(FieldType::FieldTypeStruct { .. }) | Some(FieldType::FieldTypeVec { .. }) | None => {
@ -743,8 +745,8 @@ pub fn parse(
fn build_default_value( fn build_default_value(
label: &Option<Ident>, label: &Option<Ident>,
field_type: Tokens, field_type: &Tokens,
default: Tokens, default: &Tokens,
) -> Option<Tokens> { ) -> Option<Tokens> {
Some(quote!{ Some(quote!{
#[allow(unused_mut)] #[allow(unused_mut)]
@ -753,7 +755,7 @@ fn build_default_value(
} }
fn build_declare_visitor( fn build_declare_visitor(
field_type: Tokens, field_type: &Tokens,
visitor: &Ident, visitor: &Ident,
visitor_label: &Ident, visitor_label: &Ident,
) -> Option<Tokens> { ) -> Option<Tokens> {
@ -771,12 +773,12 @@ fn build_declare_visitor(
} }
fn build_call_visitor( fn build_call_visitor(
field_type: Tokens, field_type: &Tokens,
visitor: &Ident, visitor: &Ident,
action: Tokens, action: &Tokens,
visitor_label: &Ident, visitor_label: &Ident,
label: &Option<Ident>, label: &Option<Ident>,
label_name: &String, label_name: &str,
) -> Option<Tokens> { ) -> Option<Tokens> {
Some(quote!{ Some(quote!{
#label_name => { #label_name => {
@ -799,7 +801,6 @@ fn build_call_visitor(
}); });
if let Ok(value) = result { if let Ok(value) = result {
// #label = value
#label#action #label#action
} }
} }
@ -809,7 +810,7 @@ fn build_call_visitor(
fn build_set_text_to_value( fn build_set_text_to_value(
field_attrs: &YaSerdeAttribute, field_attrs: &YaSerdeAttribute,
label: &Option<Ident>, label: &Option<Ident>,
action: Tokens, action: &Tokens,
) -> Option<Tokens> { ) -> Option<Tokens> {
if field_attrs.text { if field_attrs.text {
Some(quote!{ Some(quote!{

10
yaserde_derive/src/de/mod.rs
View File

@ -13,16 +13,16 @@ pub fn expand_derive_deserialize(ast: &syn::DeriveInput) -> Result<quote::Tokens
let data = &ast.data; let data = &ast.data;
let root_attrs = attribute::YaSerdeAttribute::parse(&attrs); let root_attrs = attribute::YaSerdeAttribute::parse(&attrs);
let root = root_attrs.clone().root.unwrap_or(name.to_string()); let root = root_attrs.clone().root.unwrap_or_else(|| name.to_string());
let impl_block = match data { let impl_block = match *data {
&syn::Data::Struct(ref data_struct) => { syn::Data::Struct(ref data_struct) => {
expand_struct::parse(data_struct, &name, &root, &root_attrs.namespaces) expand_struct::parse(data_struct, &name, &root, &root_attrs.namespaces)
} }
&syn::Data::Enum(ref data_enum) => { syn::Data::Enum(ref data_enum) => {
expand_enum::parse(data_enum, &name, &root, &root_attrs.namespaces) expand_enum::parse(data_enum, &name, &root, &root_attrs.namespaces)
} }
&syn::Data::Union(ref _data_union) => unimplemented!(), syn::Data::Union(ref _data_union) => unimplemented!(),
}; };
let dummy_const = Ident::new( let dummy_const = Ident::new(

4
yaserde_derive/src/field_type.rs
View File

@ -61,8 +61,8 @@ pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
fn get_vec_type(t: &syn::PathSegment) -> Option<syn::Ident> { fn get_vec_type(t: &syn::PathSegment) -> Option<syn::Ident> {
if let syn::PathArguments::AngleBracketed(ref args) = t.arguments { if let syn::PathArguments::AngleBracketed(ref args) = t.arguments {
if let Some(Pair::End(tt)) = args.args.first() { if let Some(Pair::End(tt)) = args.args.first() {
if let &syn::GenericArgument::Type(ref argument) = tt { if let syn::GenericArgument::Type(ref argument) = *tt {
if let &Path(ref path2) = argument { if let Path(ref path2) = argument {
if let Some(Pair::End(ttt)) = path2.path.segments.first() { if let Some(Pair::End(ttt)) = path2.path.segments.first() {
return Some(ttt.ident); return Some(ttt.ident);
} }

6
yaserde_derive/src/ser/expand_enum.rs
View File

@ -10,7 +10,7 @@ use proc_macro2::Span;
pub fn serialize( pub fn serialize(
data_enum: &DataEnum, data_enum: &DataEnum,
name: &Ident, name: &Ident,
root: &String, root: &str,
namespaces: &BTreeMap<String, String>, namespaces: &BTreeMap<String, String>,
) -> Tokens { ) -> Tokens {
let write_enum_content: Tokens = data_enum let write_enum_content: Tokens = data_enum
@ -42,12 +42,12 @@ pub fn serialize(
.iter() .iter()
.map(|ref field| { .map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs); let field_attrs = YaSerdeAttribute::parse(&field.attrs);
if field_attrs.attribute == true { if field_attrs.attribute {
return None; return None;
} }
let field_label = field.ident; let field_label = field.ident;
if field_attrs.text == true { if field_attrs.text {
return Some(quote!( return Some(quote!(
let data_event = XmlEvent::characters(&self.#field_label); let data_event = XmlEvent::characters(&self.#field_label);
let _ret = writer.write(data_event); let _ret = writer.write(data_event);

8
yaserde_derive/src/ser/expand_struct.rs
View File

@ -10,7 +10,7 @@ use std::string::ToString;
pub fn serialize( pub fn serialize(
data_struct: &DataStruct, data_struct: &DataStruct,
name: &Ident, name: &Ident,
root: &String, root: &str,
namespaces: &BTreeMap<String, String>, namespaces: &BTreeMap<String, String>,
) -> Tokens { ) -> Tokens {
let build_attributes: Tokens = data_struct let build_attributes: Tokens = data_struct
@ -18,7 +18,7 @@ pub fn serialize(
.iter() .iter()
.map(|ref field| { .map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs); let field_attrs = YaSerdeAttribute::parse(&field.attrs);
if field_attrs.attribute == false { if !field_attrs.attribute {
return None; return None;
} }
@ -90,12 +90,12 @@ pub fn serialize(
.iter() .iter()
.map(|ref field| { .map(|ref field| {
let field_attrs = YaSerdeAttribute::parse(&field.attrs); let field_attrs = YaSerdeAttribute::parse(&field.attrs);
if field_attrs.attribute == true { if field_attrs.attribute {
return None; return None;
} }
let label = field.ident; let label = field.ident;
if field_attrs.text == true { if field_attrs.text {
return Some(quote!( return Some(quote!(
let data_event = XmlEvent::characters(&self.#label); let data_event = XmlEvent::characters(&self.#label);
let _ret = writer.write(data_event); let _ret = writer.write(data_event);

10
yaserde_derive/src/ser/mod.rs
View File

@ -13,7 +13,7 @@ pub fn expand_derive_serialize(ast: &syn::DeriveInput) -> Result<quote::Tokens,
let data = &ast.data; let data = &ast.data;
let root_attrs = attribute::YaSerdeAttribute::parse(&attrs); let root_attrs = attribute::YaSerdeAttribute::parse(&attrs);
let root = root_attrs.clone().root.unwrap_or(name.to_string()); let root = root_attrs.clone().root.unwrap_or_else(|| name.to_string());
let root = if let Some(prefix) = root_attrs.prefix { let root = if let Some(prefix) = root_attrs.prefix {
prefix + ":" + &root prefix + ":" + &root
@ -21,14 +21,14 @@ pub fn expand_derive_serialize(ast: &syn::DeriveInput) -> Result<quote::Tokens,
root root
}; };
let impl_block = match data { let impl_block = match *data {
&syn::Data::Struct(ref data_struct) => { syn::Data::Struct(ref data_struct) => {
expand_struct::serialize(data_struct, &name, &root, &root_attrs.namespaces) expand_struct::serialize(data_struct, &name, &root, &root_attrs.namespaces)
} }
&syn::Data::Enum(ref data_enum) => { syn::Data::Enum(ref data_enum) => {
expand_enum::serialize(data_enum, &name, &root, &root_attrs.namespaces) expand_enum::serialize(data_enum, &name, &root, &root_attrs.namespaces)
} }
&syn::Data::Union(ref _data_union) => unimplemented!(), syn::Data::Union(ref _data_union) => unimplemented!(),
}; };
let dummy_const = Ident::new( let dummy_const = Ident::new(