From e2a2779f71428aa0ca8fcbd37eca0c0401a3b304 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Wed, 22 Apr 2020 19:05:13 +0200 Subject: [PATCH] format code --- yaserde_derive/src/common/attribute.rs | 40 ++++++++++++-------------- yaserde_derive/src/common/field.rs | 9 ++++-- yaserde_derive/src/de/expand_struct.rs | 13 +++++++-- yaserde_derive/src/de/mod.rs | 9 ++++-- 4 files changed, 44 insertions(+), 27 deletions(-) diff --git a/yaserde_derive/src/common/attribute.rs b/yaserde_derive/src/common/attribute.rs index 45b1138..2896bab 100644 --- a/yaserde_derive/src/common/attribute.rs +++ b/yaserde_derive/src/common/attribute.rs @@ -113,28 +113,26 @@ impl YaSerdeAttribute { prefix: &Option, element_namespace: TokenStream, element_name: TokenStream, - take_root_prefix: bool - ) -> TokenStream { - let configured_prefix = - if take_root_prefix { - self.prefix.clone() - } else { - prefix.clone() - }; + take_root_prefix: bool, + ) -> TokenStream { + let configured_prefix = if take_root_prefix { + self.prefix.clone() + } else { + prefix.clone() + }; - let namespaces_matches : TokenStream = - self - .namespaces - .iter() - .map(|(prefix, namespace)| { - if configured_prefix == Some(prefix.to_string()) { - Some(quote!(#namespace => {})) - } else { - None - } - }) - .filter_map(|x| x) - .collect(); + let namespaces_matches: TokenStream = self + .namespaces + .iter() + .map(|(prefix, namespace)| { + if configured_prefix == Some(prefix.to_string()) { + Some(quote!(#namespace => {})) + } else { + None + } + }) + .filter_map(|x| x) + .collect(); quote!( if let Some(namespace) = #element_namespace { diff --git a/yaserde_derive/src/common/field.rs b/yaserde_derive/src/common/field.rs index 241bf2c..0a00087 100644 --- a/yaserde_derive/src/common/field.rs +++ b/yaserde_derive/src/common/field.rs @@ -123,8 +123,13 @@ impl YaSerdeField { root_attributes: &YaSerdeAttribute, element_namespace: TokenStream, element_name: TokenStream, - ) -> TokenStream { - root_attributes.get_namespace_matching(&self.attributes.prefix, element_namespace, element_name, false) + ) -> TokenStream { + root_attributes.get_namespace_matching( + &self.attributes.prefix, + element_namespace, + element_name, + false, + ) } pub fn ser_wrap_default_attribute( diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index 0a4bffd..bd9c718 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/yaserde_derive/src/de/expand_struct.rs @@ -9,7 +9,12 @@ pub fn parse( root: &str, root_attributes: &YaSerdeAttribute, ) -> TokenStream { - let namespaces_matching = root_attributes.get_namespace_matching(&None, quote!(struct_namespace), quote!(named_element), true); + let namespaces_matching = root_attributes.get_namespace_matching( + &None, + quote!(struct_namespace), + quote!(named_element), + true, + ); let variables: TokenStream = data_struct .fields @@ -400,7 +405,11 @@ fn build_call_visitor( let label_name = field.renamed_label_without_namespace(); let visitor_label = build_visitor_ident(&label_name, field.get_span(), None); - let namespaces_matching = field.get_namespace_matching(root_attributes, quote!(name.namespace.as_ref()), quote!(name.local_name.as_str())); + let namespaces_matching = field.get_namespace_matching( + root_attributes, + quote!(name.namespace.as_ref()), + quote!(name.local_name.as_str()), + ); Some(quote! { #label_name => { diff --git a/yaserde_derive/src/de/mod.rs b/yaserde_derive/src/de/mod.rs index a4c4355..a6df2b3 100644 --- a/yaserde_derive/src/de/mod.rs +++ b/yaserde_derive/src/de/mod.rs @@ -13,13 +13,18 @@ pub fn expand_derive_deserialize(ast: &syn::DeriveInput) -> Result { expand_struct::parse(data_struct, name, &root_name, &root_attributes) } - syn::Data::Enum(ref data_enum) => expand_enum::parse(data_enum, name, &root_name, &root_attributes), + syn::Data::Enum(ref data_enum) => { + expand_enum::parse(data_enum, name, &root_name, &root_attributes) + } syn::Data::Union(ref _data_union) => unimplemented!(), };