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

reformat more code

Browse Source
This commit is contained in:
Marc-Antoine Arnaud 2020-04-19 16:34:39 +02:00
parent fbc329e2be
commit 1c9ee67ace
5 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yaserde_derive/src/de/build_default_value.rs
View File

@ -7,7 +7,9 @@ pub fn build_default_value(
value: &TokenStream, value: &TokenStream,
default: &Option<String>, default: &Option<String>,
) -> Option<TokenStream> { ) -> Option<TokenStream> {
if let Some(d) = default { let value = default
.as_ref()
.map(|d| {
let default_function = Ident::new( let default_function = Ident::new(
&d, &d,
label label
@ -15,14 +17,12 @@ pub fn build_default_value(
.map_or(Span::call_site(), |ident| ident.span()), .map_or(Span::call_site(), |ident| ident.span()),
); );
Some(quote! { quote!(#default_function())
#[allow(unused_mut)]
let mut #label : #field_type = #default_function();
}) })
} else { .unwrap_or_else(|| quote!(#value));
Some(quote! { Some(quote! {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut #label : #field_type = #value; let mut #label : #field_type = #value;
}) })
}
} }

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

@ -1,9 +1,6 @@
use crate::attribute::*; use crate::attribute::*;
use crate::field_type::*; use crate::field_type::*;
use crate::ser::{ use crate::ser::{implement_deserializer::implement_deserializer, label::build_label_name};
implement_deserializer::implement_deserializer,
label::build_label_name,
};
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use syn::spanned::Spanned; use syn::spanned::Spanned;
use syn::DataEnum; use syn::DataEnum;
@ -33,7 +30,7 @@ fn inner_enum_inspector(
data_enum: &DataEnum, data_enum: &DataEnum,
name: &Ident, name: &Ident,
root_attributes: &YaSerdeAttribute, root_attributes: &YaSerdeAttribute,
) -> TokenStream { ) -> TokenStream {
data_enum data_enum
.variants .variants
.iter() .iter()

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

@ -1,9 +1,7 @@
use crate::attribute::*; use crate::attribute::*;
use crate::field_type::*; use crate::field_type::*;
use crate::ser::{ use crate::ser::{
element::*, element::*, implement_deserializer::implement_deserializer, label::build_label_name,
implement_deserializer::implement_deserializer,
label::build_label_name,
}; };
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use syn::spanned::Spanned; use syn::spanned::Spanned;
@ -27,7 +25,11 @@ pub fn serialize(
let label = &field.ident; let label = &field.ident;
let label_name = build_label_name(&label.as_ref().unwrap(), &field_attrs, &root_attributes.default_namespace); let label_name = build_label_name(
&label.as_ref().unwrap(),
&field_attrs,
&root_attributes.default_namespace,
);
get_field_type(field).and_then(|f| match f { get_field_type(field).and_then(|f| match f {
FieldType::FieldTypeString FieldType::FieldTypeString
@ -223,7 +225,11 @@ pub fn serialize(
)); ));
} }
let label_name = build_label_name(&label.as_ref().unwrap(), &field_attrs, &root_attributes.default_namespace); let label_name = build_label_name(
&label.as_ref().unwrap(),
&field_attrs,
&root_attributes.default_namespace,
);
let conditions = condition_generator(label, &field_attrs); let conditions = condition_generator(label, &field_attrs);
get_field_type(field).and_then(|f| match f { get_field_type(field).and_then(|f| match f {

1
yaserde_derive/src/ser/label.rs
View File

@ -1,4 +1,3 @@
use crate::attribute::YaSerdeAttribute; use crate::attribute::YaSerdeAttribute;
use proc_macro2::Ident; use proc_macro2::Ident;

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

@ -1,8 +1,8 @@
pub mod element; pub mod element;
pub mod expand_enum; pub mod expand_enum;
pub mod expand_struct; pub mod expand_struct;
pub mod label;
pub mod implement_deserializer; pub mod implement_deserializer;
pub mod label;
pub mod namespace; pub mod namespace;
use crate::attribute::YaSerdeAttribute; use crate::attribute::YaSerdeAttribute;