diff --git a/yaserde/src/de/mod.rs b/yaserde/src/de/mod.rs index 374b124..86bbbe6 100644 --- a/yaserde/src/de/mod.rs +++ b/yaserde/src/de/mod.rs @@ -45,7 +45,7 @@ impl<'de, R: Read> Deserializer { } if let Some(ref next) = self.peeked { - Ok(&next) + Ok(next) } else { Err(String::from("unable to peek next item")) } diff --git a/yaserde_derive/src/de/expand_enum.rs b/yaserde_derive/src/de/expand_enum.rs index fcc5093..cf42a28 100644 --- a/yaserde_derive/src/de/expand_enum.rs +++ b/yaserde_derive/src/de/expand_enum.rs @@ -16,13 +16,13 @@ pub fn parse( let variables: Tokens = data_enum .variants .iter() - .map(|ref variant| match variant.fields { + .map(|variant| match variant.fields { Fields::Unit => None, Fields::Named(ref fields) => { let enum_fields = fields .named .iter() - .map(|ref field| { + .map(|field| { let field_label = field.ident; match get_field_type(field) { @@ -131,14 +131,14 @@ pub fn parse( let enum_visitors: Tokens = data_enum .variants .iter() - .map(|ref variant| { + .map(|variant| { match variant.fields { Fields::Unit => None, Fields::Named(ref fields) => { let enum_fields = fields .named .iter() - .map(|ref field| { + .map(|field| { // let label = field.ident; // let label_name = label.unwrap().to_string(); // let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site()); @@ -186,7 +186,7 @@ pub fn parse( let match_to_enum: Tokens = data_enum .variants .iter() - .map(|ref variant| { + .map(|variant| { let field_attrs = YaSerdeAttribute::parse(&variant.attrs); let renamed_label = match field_attrs.rename { Some(value) => Ident::new(&format!("{}", value), Span::call_site()), diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index 3fd1b08..9f876a7 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/yaserde_derive/src/de/expand_struct.rs @@ -14,7 +14,7 @@ pub fn parse( ) -> Tokens { let validate_namespace: Tokens = namespaces .iter() - .map(|(ref _prefix, ref namespace)| { + .map(|(_prefix, namespace)| { Some(quote!( let mut found = false; @@ -39,7 +39,7 @@ pub fn parse( let variables: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let label = field.ident; match get_field_type(field) { Some(FieldType::FieldTypeString) => { @@ -118,7 +118,7 @@ pub fn parse( let field_visitors: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); let label_name = if let Some(value) = field_attrs.rename { Ident::new(&format!("{}", value), Span::call_site()).to_string() @@ -259,7 +259,7 @@ pub fn parse( let call_visitors: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); let label = field.ident; @@ -546,7 +546,7 @@ pub fn parse( let attributes_loading: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); if !field_attrs.attribute { return None; @@ -598,7 +598,7 @@ pub fn parse( let set_text: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let label = field.ident; let field_attrs = YaSerdeAttribute::parse(&field.attrs); @@ -667,7 +667,7 @@ pub fn parse( let struct_builder: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let label = field.ident; if get_field_type(field).is_some() { diff --git a/yaserde_derive/src/de/mod.rs b/yaserde_derive/src/de/mod.rs index 091d31d..8c81ded 100644 --- a/yaserde_derive/src/de/mod.rs +++ b/yaserde_derive/src/de/mod.rs @@ -12,15 +12,15 @@ pub fn expand_derive_deserialize(ast: &syn::DeriveInput) -> Result { - 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) => { - 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!(), }; diff --git a/yaserde_derive/src/ser/expand_enum.rs b/yaserde_derive/src/ser/expand_enum.rs index d66829e..86ea761 100644 --- a/yaserde_derive/src/ser/expand_enum.rs +++ b/yaserde_derive/src/ser/expand_enum.rs @@ -16,7 +16,7 @@ pub fn serialize( let write_enum_content: Tokens = data_enum .variants .iter() - .map(|ref variant| { + .map(|variant| { let variant_attrs = YaSerdeAttribute::parse(&variant.attrs); let renamed_label = match variant_attrs.rename { Some(value) => Ident::new(&format!("{}", value), Span::call_site()), @@ -40,7 +40,7 @@ pub fn serialize( let enum_fields = fields .named .iter() - .map(|ref field| { + .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); if field_attrs.attribute { return None; @@ -145,7 +145,7 @@ pub fn serialize( let add_namespaces: Tokens = namespaces .iter() - .map(|(ref prefix, ref namespace)| { + .map(|(prefix, namespace)| { Some(quote!( .ns(#prefix, #namespace) )) diff --git a/yaserde_derive/src/ser/expand_struct.rs b/yaserde_derive/src/ser/expand_struct.rs index 465145a..298a570 100644 --- a/yaserde_derive/src/ser/expand_struct.rs +++ b/yaserde_derive/src/ser/expand_struct.rs @@ -16,7 +16,7 @@ pub fn serialize( let build_attributes: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); if !field_attrs.attribute { return None; @@ -73,7 +73,7 @@ pub fn serialize( let add_namespaces: Tokens = namespaces .iter() - .map(|(ref prefix, ref namespace)| { + .map(|(prefix, namespace)| { Some(quote!( .ns(#prefix, #namespace) )) @@ -88,7 +88,7 @@ pub fn serialize( let struct_inspector: Tokens = data_struct .fields .iter() - .map(|ref field| { + .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); if field_attrs.attribute { return None; diff --git a/yaserde_derive/src/ser/mod.rs b/yaserde_derive/src/ser/mod.rs index 2929b1f..b943eca 100644 --- a/yaserde_derive/src/ser/mod.rs +++ b/yaserde_derive/src/ser/mod.rs @@ -12,7 +12,7 @@ pub fn expand_derive_serialize(ast: &syn::DeriveInput) -> Result Result { - 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) => { - 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!(), };