From 8079f0041598e2ac41a3b079eea9383a8b56c5df Mon Sep 17 00:00:00 2001 From: superuzir Date: Tue, 31 Dec 2019 14:58:28 +0700 Subject: [PATCH] Fix more clippy warnings --- yaserde_derive/src/de/expand_struct.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index f3a61ab..4f3fae2 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/yaserde_derive/src/de/expand_struct.rs @@ -203,11 +203,9 @@ pub fn parse( .iter() .map(|field| { let field_attrs = YaSerdeAttribute::parse(&field.attrs); - let label_name = if let Some(value) = field_attrs.rename { - Ident::new(&value.to_string(), Span::call_site()).to_string() - } else { - field.ident.clone().unwrap().to_string() - }; + let label_name = field_attrs + .rename + .unwrap_or_else(|| field.ident.as_ref().unwrap().to_string()); let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site()); @@ -896,11 +894,10 @@ pub fn parse( } let label = &get_value_label(&field.ident); - let label_name = if let Some(value) = field_attrs.rename { - Ident::new(&value.to_string(), Span::call_site()).to_string() - } else { - field.ident.clone().unwrap().to_string() - }; + + let label_name = field_attrs + .rename + .unwrap_or_else(|| field.ident.as_ref().unwrap().to_string()); let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());