Fix rust 1.88.0 clippies (#1818)

Signed-off-by: Sean Young <sean@mess.org>

Author: seanyoung

src/bin/idl/mod.rs

@@ -205,7 +205,7 @@ fn write_solidity(idl: &Idl, mut f: File) -> Result<(), std::io::Error> {
     docs(&mut f, 0, &idl.docs)?;
 
     if let Some(program_id) = program_id(idl) {
-        writeln!(f, "@program_id(\"{}\")", program_id)?;
+        writeln!(f, "@program_id(\"{program_id}\")")?;
     }
     writeln!(f, "interface {} {{", idl.name)?;
 

src/bin/languageserver/mod.rs

@@ -2739,7 +2739,7 @@ impl LanguageServer for SolangServer {
         let source = std::fs::read_to_string(source_path).map_err(|err| Error {
             code: ErrorCode::InternalError,
             message: format!("Failed to read file: {uri}").into(),
-            data: Some(Value::String(format!("{:?}", err))),
+            data: Some(Value::String(format!("{err:?}"))),
         })?;
         let source_parsed = parse(&source).map_err(|err| {
             let err = err
@@ -2763,7 +2763,7 @@ impl LanguageServer for SolangServer {
         format_to(&mut source_formatted, source_parsed, config).map_err(|err| Error {
             code: ErrorCode::InternalError,
             message: format!("Failed to format file: {uri}").into(),
-            data: Some(Value::String(format!("{:?}", err))),
+            data: Some(Value::String(format!("{err:?}"))),
         })?;
 
         // create a `TextEdit` instance that replaces the contents of the file with the formatted text

src/bin/solang.rs

@@ -251,10 +251,7 @@ fn compile(compile_args: &Compile) {
 
         let authors = if let Some(authors) = &compile_args.package.authors {
             if !target.is_polkadot() {
-                eprintln!(
-                    "warning: the `authors` flag will be ignored for {} target",
-                    target
-                )
+                eprintln!("warning: the `authors` flag will be ignored for {target} target")
             }
             authors.clone()
         } else {

src/codegen/cfg.rs

@@ -1275,7 +1275,7 @@ impl ControlFlowGraph {
                     None => "_".to_string(),
                 },
                 if let Some(no) = constructor_no {
-                    format!("{}", no)
+                    format!("{no}")
                 } else {
                     String::new()
                 },

src/codegen/encoding/mod.rs

@@ -1103,9 +1103,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/mod.rs

@@ -413,7 +413,7 @@ fn layout(contract_no: usize, ns: &mut Namespace) {
                 if slot > value {
                     ns.diagnostics.push(Diagnostic::error(
                         exp.loc(),
-                        format!("contract requires at least {} bytes of space", slot),
+                        format!("contract requires at least {slot} bytes of space"),
                     ));
                 } else if value > BigInt::from(MAXIMUM_ACCOUNT_SIZE) {
                     ns.diagnostics.push(Diagnostic::error(

src/codegen/revert.rs

@@ -32,6 +32,7 @@ pub(crate) const PANIC_SELECTOR: [u8; 4] = [0x4e, 0x48, 0x7b, 0x71];
 ///
 /// Marked as non-exhaustive because Solidity may add more variants in the future.
 #[non_exhaustive]
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, PartialEq, Clone)]
 pub enum SolidityError {
     /// Reverts with "empty error data"; stems from `revert()` or `require()` without string arguments.
@@ -399,7 +400,7 @@ pub(super) fn revert(
                 let error_ty = error_no
                     .map(|n| ns.errors[n].name.as_str())
                     .unwrap_or("unspecified");
-                let reason = format!("{} revert encountered", error_ty);
+                let reason = format!("{error_ty} revert encountered");
                 log_runtime_error(opt.log_runtime_errors, &reason, *loc, cfg, vartab, ns);
             }
         }

src/codegen/solana_accounts/account_collection.rs

@@ -75,7 +75,7 @@ impl RecurseData<'_> {
 
     fn add_program_id(&mut self, contract_name: &String) {
         self.add_account(
-            format!("{}_programId", contract_name),
+            format!("{contract_name}_programId"),
             &SolanaAccount {
                 loc: Loc::Codegen,
                 is_signer: false,

src/codegen/statements/try_catch.rs

@@ -446,7 +446,7 @@ fn insert_catch_clauses(
         .iter()
         .enumerate()
         .map(|(n, clause)| {
-            let clause_body_block = cfg.new_basic_block(format!("catch_error_{}", n));
+            let clause_body_block = cfg.new_basic_block(format!("catch_error_{n}"));
 
             cfg.set_basic_block(clause_body_block);
             let types = &[Type::Bytes(4), clause.param.as_ref().unwrap().ty.clone()];