Make Clippy happy

Author: smoelius

clippy.toml

@@ -1,3 +1,3 @@
 too-many-arguments-threshold = 13
 cognitive-complexity-threshold = 37
-disallowed-names = ["binary"]
+disallowed-names = ["binary", "_binary"]

src/codegen/encoding/mod.rs

@@ -1242,9 +1242,7 @@ pub(crate) trait AbiEncoding {
         // allocated the outer dimension, i.e., we are about to read a 'int[3][4]' item.
         // Arrays whose elements are dynamic cannot be verified.
         if validator.validation_necessary()
-            && !dims[0..(dimension + 1)]
-                .iter()
-                .any(|d| *d == ArrayLength::Dynamic)
+            && !dims[0..(dimension + 1)].contains(&ArrayLength::Dynamic)
             && !elem_ty.is_dynamic(ns)
         {
             let mut elems = BigInt::one();

src/codegen/events/polkadot.rs

@@ -148,9 +148,8 @@ impl EventEmitter for PolkadotEventEmitter<'_> {
             .iter()
             .map(|e| expression(e, cfg, contract_no, Some(func), self.ns, vartab, opt))
             .collect::<Vec<_>>();
-        let encoded_data = data
-            .is_empty()
-            .then(|| Expression::AllocDynamicBytes {
+        let encoded_data = if data.is_empty() {
+            Expression::AllocDynamicBytes {
                 loc,
                 ty: Type::DynamicBytes,
                 size: Expression::NumberLiteral {
@@ -160,8 +159,10 @@ impl EventEmitter for PolkadotEventEmitter<'_> {
                 }
                 .into(),
                 initializer: Vec::new().into(),
-            })
-            .unwrap_or_else(|| abi_encode(&loc, data, self.ns, vartab, cfg, false).0);
+            }
+        } else {
+            abi_encode(&loc, data, self.ns, vartab, cfg, false).0
+        };
 
         cfg.add(
             vartab,

src/codegen/revert.rs

@@ -31,6 +31,7 @@ pub(crate) const PANIC_SELECTOR: [u8; 4] = [0x4e, 0x48, 0x7b, 0x71];
 /// Corresponds to the error types from the Solidity language.
 ///
 /// Marked as non-exhaustive because Solidity may add more variants in the future.
+#[allow(clippy::large_enum_variant)]
 #[non_exhaustive]
 #[derive(Debug, PartialEq, Clone)]
 pub enum SolidityError {

src/emit/expression.rs

@@ -2701,7 +2701,7 @@ fn bytes_swap<'a, T: TargetRuntime<'a> + ?Sized>(
         Type::Int(_) | Type::Uint(_) => {
             let value = expression(target, bin, expr, vartab, function).into_int_value();
 
-            let llvm_ty = bin.llvm_type(&ty);
+            let llvm_ty = bin.llvm_type(ty);
 
             let src = bin.build_alloca(function, llvm_ty, "src");
 

src/emit/strings.rs

@@ -252,7 +252,7 @@ pub(super) fn format_evaluated_args<'a>(
                 };
             }
             (false, Type::Bytes(size)) => {
-                let buf = bin.build_alloca(function, bin.llvm_type(&arg_ty), "bytesN");
+                let buf = bin.build_alloca(function, bin.llvm_type(arg_ty), "bytesN");
 
                 bin.builder.build_store(buf, val.into_int_value()).unwrap();
 
@@ -375,7 +375,7 @@ pub(super) fn format_evaluated_args<'a>(
                         .unwrap()
                         .into_pointer_value();
                 } else {
-                    let buf = bin.build_alloca(function, bin.llvm_type(&arg_ty), "uint");
+                    let buf = bin.build_alloca(function, bin.llvm_type(arg_ty), "uint");
 
                     bin.builder.build_store(buf, val.into_int_value()).unwrap();
 
@@ -535,7 +535,7 @@ pub(super) fn format_evaluated_args<'a>(
                         .unwrap()
                         .into_pointer_value();
                 } else {
-                    let buf = bin.build_alloca(function, bin.llvm_type(&arg_ty), "int");
+                    let buf = bin.build_alloca(function, bin.llvm_type(arg_ty), "int");
 
                     bin.builder
                         .build_store(buf, val_phi.as_basic_value().into_int_value())

src/lir/lir_type.rs

@@ -50,6 +50,7 @@ pub enum Type {
     Slice(Box<Type>),
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug)]
 pub enum InternalCallTy {
     Static { cfg_no: usize },

src/sema/expression/function_call.rs

@@ -3129,6 +3129,7 @@ fn is_solana_external_call(
 }
 
 /// Data structure to manage the returns of 'preprocess_contract_call'
+#[allow(clippy::large_enum_variant)]
 enum PreProcessedCall {
     Success {
         call_args: CallArgs,

src/sema/types.rs

@@ -1408,7 +1408,7 @@ impl Type {
             Type::Bytes(_) => false,
             Type::Enum(_) => false,
             Type::Struct(_) => true,
-            Type::Array(_, dims) => !dims.iter().any(|d| *d == ArrayLength::Dynamic),
+            Type::Array(_, dims) => !dims.contains(&ArrayLength::Dynamic),
             Type::DynamicBytes => false,
             Type::String => false,
             Type::Mapping(..) => false,
@@ -1552,7 +1552,7 @@ impl Type {
             Type::Int(n) | Type::Uint(n) => BigInt::from(n / 8),
             Type::Rational => unreachable!(),
             Type::Array(ty, dims) => {
-                if dims.iter().any(|d| *d == ArrayLength::Dynamic) {
+                if dims.contains(&ArrayLength::Dynamic) {
                     BigInt::from(ns.target.ptr_size() / 8)
                 } else {
                     ty.struct_elem_alignment(ns)

tests/stylus.rs

@@ -74,7 +74,7 @@ fn tests(required_forbidden_pairs: &[(&[&str], &[&str])]) {
     let mut successes = Vec::new();
     let mut failures = Vec::new();
     for path in &paths {
-        let contents = read_to_string(&path).unwrap();
+        let contents = read_to_string(path).unwrap();
         let contracts = contract_re
             .captures_iter(&contents)
             .map(|captures| {
@@ -108,7 +108,7 @@ fn tests(required_forbidden_pairs: &[(&[&str], &[&str])]) {
         eprintln!("Deploying `{}`", path.display());
 
         let (tempdir, address) = match deploy(
-            PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(&path),
+            PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(path),
             contract,
         ) {
             Ok((tempdir, address)) => (tempdir, address),
@@ -130,7 +130,7 @@ fn tests(required_forbidden_pairs: &[(&[&str], &[&str])]) {
 
         for function in argless_functions {
             eprintln!("Testing `{function}`");
-            match call(dir, &address, &[&format!("{function}()")]) {
+            match call(dir, &address, [format!("{function}()")]) {
                 Ok(_) => successes.push((path.to_path_buf(), function.to_owned())),
                 Err(Error(severity, error)) => {
                     failures.push((path.to_path_buf(), function.to_owned(), severity, error))
@@ -244,7 +244,7 @@ where
         "--rpc-url=http://localhost:8547",
         "--private-key",
         PRIVATE_KEY,
-        &address,
+        address,
     ]
     .into_iter()
     .map(OsStr::new);