Fix clippy suggestion (#1310), Fixes for nightly changes (#1327)

use-ink · Oct 18, 2022 · adf1636 · adf1636
1 parent b540250
commit adf1636
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/crates/lang/ir/src/ir/config.rs b/crates/lang/ir/src/ir/config.rs
@@ -131,9 +131,7 @@ impl TryFrom<ast::AttributeArgs> for Config {
                     ))
                 }
             } else if arg.name.is_ident("keep_attr") {
-                if let Err(err) = whitelisted_attributes.parse_arg_value(&arg) {
-                    return Err(err)
-                }
+                whitelisted_attributes.parse_arg_value(&arg)?;
             } else {
                 return Err(format_err_spanned!(
                     arg,

diff --git a/crates/lang/ir/src/ir/trait_def/config.rs b/crates/lang/ir/src/ir/trait_def/config.rs
@@ -92,9 +92,7 @@ impl TryFrom<ast::AttributeArgs> for TraitDefinitionConfig {
                     ))
                 }
             } else if arg.name.is_ident("keep_attr") {
-                if let Err(err) = whitelisted_attributes.parse_arg_value(&arg) {
-                    return Err(err)
-                }
+                whitelisted_attributes.parse_arg_value(&arg)?;
             } else {
                 return Err(format_err_spanned!(
                     arg,

diff --git a/crates/lang/ir/src/ir/trait_def/item/mod.rs b/crates/lang/ir/src/ir/trait_def/item/mod.rs
@@ -287,7 +287,7 @@ impl InkItemTrait {
 
     /// Constructors are generally not allowed in ink! trait definitions.
     fn analyse_trait_constructor(constructor: &syn::TraitItemMethod) -> Result<()> {
-        return Err(format_err!(
+        Err(format_err!(
             constructor.span(),
             "ink! trait definitions must not have constructors",
         ))

diff --git a/crates/lang/ir/src/ir/trait_def/item/trait_item.rs b/crates/lang/ir/src/ir/trait_def/item/trait_item.rs
@@ -176,14 +176,10 @@ impl<'a> InkTraitMessage<'a> {
                         true
                     }
                     syn::FnArg::Typed(pat_type) => {
-                        match &*pat_type.ty {
-                            syn::Type::Reference(reference)
-                                if reference.mutability.is_some() =>
-                            {
-                                true
-                            }
-                            _ => false,
-                        }
+                        matches!(
+                            &*pat_type.ty,
+                            syn::Type::Reference(reference) if reference.mutability.is_some()
+                        )
                     }
                     _ => false,
                 }