fix: appease clippy

Signed-off-by: salaheldinsoliman <salaheldin_sameh@aucegypt.edu>

Author: salaheldinsoliman

Dockerfile

@@ -1,5 +1,5 @@
 # Start from a rust base image
-FROM rust:1.81.0 as base
+FROM rust:1.83.0 as base
 
 # Set the current directory
 WORKDIR /app

Makefile.toml

@@ -4,7 +4,7 @@ skip_core_tasks = true
 
 [tasks.deps-wasm]
 script = '''
-cargo install wasm-bindgen-cli
+cargo install -f wasm-bindgen-cli --version 0.2.99
 '''
 
 [tasks.deps-npm]

crates/backend/src/main.rs

@@ -59,7 +59,7 @@ async fn main() -> std::io::Result<()> {
                     .add(("Cross-Origin-Opener-Policy", "same-origin"))
                     .add(("Cross-Origin-Embedder-Policy", "require-corp")),
             )
-            .route("/compile", post().to(|body| route_compile(body)));
+            .route("/compile", post().to(route_compile));
 
         // Serve frontend files if configured via CLI
         match frontend_folder {

crates/browser/tests/server_tests.rs

@@ -13,12 +13,12 @@ mod tests {
 
     use super::*;
 
-    const INITIALIZE_REQUEST: &'static str = r#"{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"clientInfo":{"name":"demo-language-client"},"capabilities":{},"rootUri":null}}"#;
-    const INITIALIZE_EXPECTED_RESPONSE: &'static str = r#"{"jsonrpc":"2.0","result":{"capabilities":{"completionProvider":{"resolveProvider":false,"triggerCharacters":["."]},"declarationProvider":true,"definitionProvider":true,"documentFormattingProvider":true,"executeCommandProvider":{"commands":[]},"hoverProvider":true,"implementationProvider":true,"referencesProvider":true,"renameProvider":true,"signatureHelpProvider":{},"textDocumentSync":2,"typeDefinitionProvider":true,"workspace":{"workspaceFolders":{"changeNotifications":true,"supported":true}},"workspaceSymbolProvider":true}},"id":1}"#;
+    const INITIALIZE_REQUEST: &str = r#"{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"clientInfo":{"name":"demo-language-client"},"capabilities":{},"rootUri":null}}"#;
+    const INITIALIZE_EXPECTED_RESPONSE: &str = r#"{"jsonrpc":"2.0","result":{"capabilities":{"completionProvider":{"resolveProvider":false,"triggerCharacters":["."]},"declarationProvider":true,"definitionProvider":true,"documentFormattingProvider":true,"executeCommandProvider":{"commands":[]},"hoverProvider":true,"implementationProvider":true,"referencesProvider":true,"renameProvider":true,"signatureHelpProvider":{},"textDocumentSync":2,"typeDefinitionProvider":true,"workspace":{"workspaceFolders":{"changeNotifications":true,"supported":true}},"workspaceSymbolProvider":true}},"id":1}"#;
 
     const INITALIZED: &str = r#"{"jsonrpc":"2.0","method":"initialized","params":{}}"#;
 
-    const TEXTDOCUMENT_DIDOPEN: &'static str = r#" {"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"inmemory://demo.js","languageId":"solidity","version":0,"text":"    // SPDX-License-Identifier: MIT\n    pragma solidity >=0.6.12 <0.9.0;\n    contract HelloWorld {\n      /**\n       * @dev Prints Hello World string\n       */\n      function print() public pure returns (string memory) {\n        return \"Hello World!\";\n      }\n    }\n"}}}"#;
+    const TEXTDOCUMENT_DIDOPEN: &str = r#" {"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"inmemory://demo.js","languageId":"solidity","version":0,"text":"    // SPDX-License-Identifier: MIT\n    pragma solidity >=0.6.12 <0.9.0;\n    contract HelloWorld {\n      /**\n       * @dev Prints Hello World string\n       */\n      function print() public pure returns (string memory) {\n        return \"Hello World!\";\n      }\n    }\n"}}}"#;
 
     const DIAGNOSTIC_REQUEST: &str = r#"{"jsonrpc":"2.0","id":3,"method":"textDocument/diagnostic","params":{"textDocument":{"uri":"inmemory://demo.js","languageId":"solidity","version":0,"text":"    // SPDX-License-Identifier: MIT\n    pragma solidity >=0.6.12 <0.9.0;\n    contract HelloWorld {\n      /**\n       * @dev Prints Hello World string\n       */\n      function print() public pure returns (string memory) {\n        return \"Hello World!\";\n      }\n    }\n"}}}"#;
 

crates/solang/solang-parser/src/helpers/loc.rs

@@ -45,19 +45,19 @@ impl<T: CodeLocation> OptionalCodeLocation for Vec<T> {
     }
 }
 
-impl<'a, T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &'a T {
+impl<T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &T {
     fn loc_opt(&self) -> Option<Loc> {
         (**self).loc_opt()
     }
 }
 
-impl<'a, T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &'a mut T {
+impl<T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &mut T {
     fn loc_opt(&self) -> Option<Loc> {
         (**self).loc_opt()
     }
 }
 
-impl<'a, T: ?Sized + ToOwned + OptionalCodeLocation> OptionalCodeLocation for Cow<'a, T> {
+impl<T: ?Sized + ToOwned + OptionalCodeLocation> OptionalCodeLocation for Cow<'_, T> {
     fn loc_opt(&self) -> Option<Loc> {
         (**self).loc_opt()
     }
@@ -160,19 +160,19 @@ impl CodeLocation for Loc {
     }
 }
 
-impl<'a, T: ?Sized + CodeLocation> CodeLocation for &'a T {
+impl<T: ?Sized + CodeLocation> CodeLocation for &T {
     fn loc(&self) -> Loc {
         (**self).loc()
     }
 }
 
-impl<'a, T: ?Sized + CodeLocation> CodeLocation for &'a mut T {
+impl<T: ?Sized + CodeLocation> CodeLocation for &mut T {
     fn loc(&self) -> Loc {
         (**self).loc()
     }
 }
 
-impl<'a, T: ?Sized + ToOwned + CodeLocation> CodeLocation for Cow<'a, T> {
+impl<T: ?Sized + ToOwned + CodeLocation> CodeLocation for Cow<'_, T> {
     fn loc(&self) -> Loc {
         (**self).loc()
     }

crates/solang/solang-parser/src/lexer.rs

@@ -182,7 +182,7 @@ pub enum Token<'input> {
     Annotation(&'input str),
 }
 
-impl<'input> fmt::Display for Token<'input> {
+impl fmt::Display for Token<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Token::Identifier(id) => write!(f, "{id}"),

crates/solang/src/codegen/mod.rs

@@ -43,8 +43,6 @@ use crate::codegen::yul::generate_yul_function_cfg;
 use crate::sema::diagnostics::Diagnostics;
 use crate::sema::eval::eval_const_number;
 use crate::sema::Recurse;
-#[cfg(feature = "wasm_opt")]
-use contract_build::OptimizationPasses;
 use num_bigint::{BigInt, Sign};
 use num_rational::BigRational;
 use num_traits::{FromPrimitive, Zero};
@@ -69,30 +67,6 @@ pub enum OptimizationLevel {
     Aggressive = 3,
 }
 
-#[cfg(feature = "llvm")]
-impl From<OptimizationLevel> for inkwell::OptimizationLevel {
-    fn from(level: OptimizationLevel) -> Self {
-        match level {
-            OptimizationLevel::None => inkwell::OptimizationLevel::None,
-            OptimizationLevel::Less => inkwell::OptimizationLevel::Less,
-            OptimizationLevel::Default => inkwell::OptimizationLevel::Default,
-            OptimizationLevel::Aggressive => inkwell::OptimizationLevel::Aggressive,
-        }
-    }
-}
-
-#[cfg(feature = "llvm")]
-impl From<inkwell::OptimizationLevel> for OptimizationLevel {
-    fn from(level: inkwell::OptimizationLevel) -> Self {
-        match level {
-            inkwell::OptimizationLevel::None => OptimizationLevel::None,
-            inkwell::OptimizationLevel::Less => OptimizationLevel::Less,
-            inkwell::OptimizationLevel::Default => OptimizationLevel::Default,
-            inkwell::OptimizationLevel::Aggressive => OptimizationLevel::Aggressive,
-        }
-    }
-}
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Options {
     pub dead_storage: bool,
@@ -105,8 +79,6 @@ pub struct Options {
     pub log_api_return_codes: bool,
     pub log_runtime_errors: bool,
     pub log_prints: bool,
-    #[cfg(feature = "wasm_opt")]
-    pub wasm_opt: Option<OptimizationPasses>,
 }
 
 impl Default for Options {
@@ -122,8 +94,6 @@ impl Default for Options {
             log_api_return_codes: false,
             log_runtime_errors: false,
             log_prints: true,
-            #[cfg(feature = "wasm_opt")]
-            wasm_opt: None,
         }
     }
 }

crates/solang/src/codegen/strength_reduce/reaching_values.rs

@@ -85,7 +85,7 @@ pub(super) fn reaching_values(
 /// changes in the set.
 /// There is a discussion to improve this function: https://github.com/hyperledger/solang/issues/934
 fn update_map(var_no: usize, set: &HashSet<Value>, map: &mut Variables) -> bool {
-    return if let Some(existing) = map.get_mut(&var_no) {
+    if let Some(existing) = map.get_mut(&var_no) {
         if existing.iter().next().map_or(false, |v| v.all_unknown()) {
             // If we already think it is unknown, nothing can improve on that
             false
@@ -134,7 +134,7 @@ fn update_map(var_no: usize, set: &HashSet<Value>, map: &mut Variables) -> bool
         }
 
         true
-    };
+    }
 }
 
 /// For a given instruction, calculate the new reaching values

crates/solang/src/codegen/subexpression_elimination/available_expression_set.rs

@@ -10,7 +10,7 @@ use std::cell::RefCell;
 use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
 
-impl<'a, 'b: 'a> AvailableExpressionSet<'a> {
+impl<'a: 'a> AvailableExpressionSet<'a> {
     /// Deep clone a set
     pub fn deep_clone(&self) -> AvailableExpressionSet<'a> {
         let mut new_set = AvailableExpressionSet {

crates/solang/src/languageserver.rs

@@ -2065,7 +2065,7 @@ impl LanguageServer for SolangServer {
 
     async fn initialized(&self, _: InitializedParams) {
         self.client
-            .log_message(MessageType::INFO, format!("Solang language server initialized"))
+            .log_message(MessageType::INFO, "Solang language server initialized".to_string())
             .await;
     }
 
@@ -2592,7 +2592,7 @@ impl LanguageServer for SolangServer {
         let mut locations: Vec<_> = caches
             .iter()
             .flat_map(|(p, cache)| {
-                let uri = Url::parse(&p).unwrap();
+                let uri = Url::parse(p).unwrap();
                 cache
                     .references
                     .iter()