From 7b633dc2f17c5767d5496aeab21d5a2edde0b7c7 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Fri, 02 Dec 2022 14:39:39 +0000 Subject: [PATCH] fix: clippy --- --- a/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs +++ b/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs @@ -85,7 +85,7 @@ ) } -pub fn impl_enum_solidity_type_name<'a>(name: &syn::Ident) -> proc_macro2::TokenStream { +pub fn impl_enum_solidity_type_name(name: &syn::Ident) -> proc_macro2::TokenStream { quote!( #[cfg(feature = "stubgen")] impl ::evm_coder::solidity::SolidityTypeName for #name { @@ -154,29 +154,26 @@ pub fn check_and_count_options(de: &syn::DataEnum) -> syn::Result { let mut count = 0; - for error in de.variants.iter().filter_map(|v| { + for v in de.variants.iter() { if !v.fields.is_empty() { - Some(Err(syn::Error::new( + return Err(syn::Error::new( v.ident.span(), "Enumeration parameters should not have fields", - ))) + )); } else if v.discriminant.is_some() { - Some(Err(syn::Error::new( + return Err(syn::Error::new( v.ident.span(), "Enumeration options should not have an explicit specified value", - ))) + )); } else { count += 1; - None } - }) { - return error; } Ok(count) } -pub fn check_repr_u8(name: &syn::Ident, attrs: &Vec) -> syn::Result<()> { +pub fn check_repr_u8(name: &syn::Ident, attrs: &[syn::Attribute]) -> syn::Result<()> { let mut has_repr = false; for attr in attrs.iter() { if attr.path.is_ident("repr") { @@ -196,18 +193,16 @@ fn check_meta_u8(meta: &syn::Meta) -> Result<(), syn::Error> { if let syn::Meta::List(p) = meta { for nm in p.nested.iter() { - if let syn::NestedMeta::Meta(m) = nm { - if let syn::Meta::Path(p) = m { - if !p.is_ident("u8") { - return Err(syn::Error::new( - p.segments - .first() - .expect("repr segments are empty") - .ident - .span(), - "Enum is not \"repr(u8)\"", - )); - } + if let syn::NestedMeta::Meta(syn::Meta::Path(p)) = nm { + if !p.is_ident("u8") { + return Err(syn::Error::new( + p.segments + .first() + .expect("repr segments are empty") + .ident + .span(), + "Enum is not \"repr(u8)\"", + )); } } } --- a/crates/evm-coder/src/solidity/mod.rs +++ b/crates/evm-coder/src/solidity/mod.rs @@ -276,7 +276,7 @@ writer: &mut impl fmt::Write, tc: &TypeCollector, ) -> fmt::Result { - let hide_comment = self.hide.then(|| "// ").unwrap_or(""); + let hide_comment = self.hide.then_some("// ").unwrap(); for doc in self.docs { writeln!(writer, "\t{hide_comment}///{}", doc)?; } -- gitstuff