Rust 2024: if let nesting, no more if_chain

Cargo.toml

@@ -2,6 +2,9 @@
 members = ["crates/*"]
 resolver = "2"
 
+[workspace.package]
+edition = "2024"
+
 [workspace.dependencies]
 common = { path = "crates/common", package = "fe-common" }
 driver = { path = "crates/driver", package = "fe-driver" }

crates/bench/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fe-bench"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dev-dependencies]
 criterion = "0.5"

crates/bench/benches/analysis.rs

@@ -1,6 +1,6 @@
 use camino::{Utf8Path, Utf8PathBuf};
-use common::{core::HasBuiltinCore, InputDb};
-use criterion::{criterion_group, criterion_main, Criterion, SamplingMode};
+use common::{InputDb, core::HasBuiltinCore};
+use criterion::{Criterion, SamplingMode, criterion_group, criterion_main};
 use driver::DriverDataBase;
 use url::Url;
 use walkdir::WalkDir;

crates/common/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fe-common"
 version = "0.26.0"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/fe"
 description = "Provides HIR definition and lowering for Fe lang."

crates/common/src/core.rs

@@ -3,8 +3,8 @@ use rust_embed::Embed;
 use url::Url;
 
 use crate::{
-    ingot::{Ingot, IngotBaseUrl},
     InputDb,
+    ingot::{Ingot, IngotBaseUrl},
 };
 
 pub static BUILTIN_CORE_BASE_URL: &str = "builtin-core:///";

crates/common/src/file/mod.rs

@@ -4,7 +4,7 @@ use camino::Utf8PathBuf;
 use url::Url;
 pub use workspace::Workspace;
 
-use crate::{ingot::Ingot, InputDb};
+use crate::{InputDb, ingot::Ingot};
 
 #[salsa::input(constructor = __new_impl)]
 #[derive(Debug)]

crates/common/src/file/workspace.rs

@@ -31,10 +31,10 @@ impl Workspace {
     ) -> Result<File, InputIndexError> {
         // Check if the file is already associated with another URL
         let paths = self.paths(db);
-        if let Some(existing_url) = paths.get(&file) {
-            if existing_url != &url {
-                return Err(InputIndexError::CannotReuseInput);
-            }
+        if let Some(existing_url) = paths.get(&file)
+            && existing_url != &url
+        {
+            return Err(InputIndexError::CannotReuseInput);
         }
 
         let files = self.files(db);

crates/common/src/graph.rs

@@ -5,7 +5,7 @@ use smol_str::SmolStr;
 use std::collections::HashMap;
 use url::Url;
 
-use crate::{config::DependencyArguments, InputDb};
+use crate::{InputDb, config::DependencyArguments};
 
 #[salsa::input]
 #[derive(Debug)]

crates/common/src/indexmap.rs

@@ -80,30 +80,32 @@ where
     V: Update,
 {
     unsafe fn maybe_update(old_pointer: *mut Self, new_map: Self) -> bool {
-        let old_map = unsafe { &mut *old_pointer };
-
-        // Check if the keys in both maps are the same w.r.t the key order.
-        let is_key_same = old_map.len() == new_map.len()
-            && old_map
-                .keys()
-                .zip(new_map.keys())
-                .all(|(old, new)| old == new);
-
-        // If the keys are different, update entire map.
-        if !is_key_same {
-            old_map.clear();
-            old_map.0.extend(new_map.0);
-            return true;
+        unsafe {
+            let old_map = &mut *old_pointer;
+
+            // Check if the keys in both maps are the same w.r.t the key order.
+            let is_key_same = old_map.len() == new_map.len()
+                && old_map
+                    .keys()
+                    .zip(new_map.keys())
+                    .all(|(old, new)| old == new);
+
+            // If the keys are different, update entire map.
+            if !is_key_same {
+                old_map.clear();
+                old_map.0.extend(new_map.0);
+                return true;
+            }
+
+            // Update values if it's different.
+            let mut changed = false;
+            for (i, new_value) in new_map.0.into_values().enumerate() {
+                let old_value = &mut old_map[i];
+                changed |= V::maybe_update(old_value, new_value);
+            }
+
+            changed
         }
-
-        // Update values if it's different.
-        let mut changed = false;
-        for (i, new_value) in new_map.0.into_values().enumerate() {
-            let old_value = &mut old_map[i];
-            changed |= V::maybe_update(old_value, new_value);
-        }
-
-        changed
     }
 }
 

crates/common/src/ingot.rs

@@ -5,11 +5,11 @@ pub use radix_immutable::StringPrefixView;
 use smol_str::SmolStr;
 use url::Url;
 
+use crate::InputDb;
 use crate::config::{Config, ConfigDiagnostic};
 use crate::core::BUILTIN_CORE_BASE_URL;
 use crate::file::{File, Workspace};
 use crate::urlext::UrlExt;
-use crate::InputDb;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum IngotKind {

crates/driver/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fe-driver"
 version = "0.26.0"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/fe"
 description = "Provides Fe driver"

crates/driver/src/db.rs

@@ -6,9 +6,9 @@ use codespan_reporting::term::{
 use common::file::File;
 use common::{define_input_db, diagnostics::CompleteDiagnostic};
 use hir::{
+    Ingot,
     hir_def::TopLevelMod,
     lower::{map_file_to_mod, module_tree},
-    Ingot,
 };
 use hir_analysis::{
     analysis_pass::{AnalysisPassManager, ParsingPass},

crates/driver/src/diagnostics.rs

@@ -3,9 +3,9 @@ use std::ops::Range;
 use camino::Utf8Path;
 use codespan_reporting as cs;
 use common::{
+    InputDb,
     diagnostics::{LabelStyle, Severity},
     file::File,
-    InputDb,
 };
 use cs::{diagnostic as cs_diag, files as cs_files};
 use hir_analysis::diagnostics::{DiagnosticVoucher, SpannedHirAnalysisDb};

crates/driver/src/lib.rs

@@ -7,18 +7,18 @@ pub mod files;
 use std::{collections::HashMap, mem::take};
 
 use common::{
+    InputDb,
     graph::{EdgeWeight, JoinEdge},
     tree::display_dependency_tree,
-    InputDb,
 };
 pub use db::DriverDataBase;
 
 use common::config::Config;
 use hir::hir_def::TopLevelMod;
 use resolver::{
+    ResolutionHandler, Resolver,
     files::{FilesResolutionDiagnostic, FilesResolutionError, FilesResolver, FilesResource},
     graph::{DiGraph, GraphResolutionHandler, GraphResolver, GraphResolverImpl},
-    ResolutionHandler, Resolver,
 };
 use url::Url;
 
@@ -42,7 +42,9 @@ pub fn init_ingot(db: &mut DriverDataBase, ingot_url: &Url) -> Vec<IngotInitDiag
         // Root ingot resolution should never fail since directory existence is validated earlier.
         // If it fails, it indicates a bug in the resolver or an unexpected system condition.
         if let Err(err) = ingot_graph_resolver.graph_resolve(&mut handler, ingot_url) {
-            panic!("Unexpected failure resolving root ingot at {ingot_url}: {err:?}. This indicates a bug in the resolver since directory existence is validated before calling init_ingot.");
+            panic!(
+                "Unexpected failure resolving root ingot at {ingot_url}: {err:?}. This indicates a bug in the resolver since directory existence is validated before calling init_ingot."
+            );
         }
 
         // Collect diagnostics from all sources
@@ -80,10 +82,10 @@ pub fn init_ingot(db: &mut DriverDataBase, ingot_url: &Url) -> Vec<IngotInitDiag
         let mut configs = HashMap::new();
         for node_idx in cyclic_subgraph.node_indices() {
             let url = &cyclic_subgraph[node_idx];
-            if let Some(ingot) = db.workspace().containing_ingot(db, url.clone()) {
-                if let Some(config) = ingot.config(db) {
-                    configs.insert(url.clone(), config);
-                }
+            if let Some(ingot) = db.workspace().containing_ingot(db, url.clone())
+                && let Some(config) = ingot.config(db)
+            {
+                configs.insert(url.clone(), config);
             }
         }
 
@@ -92,7 +94,9 @@ pub fn init_ingot(db: &mut DriverDataBase, ingot_url: &Url) -> Vec<IngotInitDiag
             .node_indices()
             .any(|idx| cyclic_subgraph[idx] == *ingot_url)
         {
-            panic!("Root ingot {ingot_url} not found in cyclic subgraph. This indicates a bug in cycle detection logic.");
+            panic!(
+                "Root ingot {ingot_url} not found in cyclic subgraph. This indicates a bug in cycle detection logic."
+            );
         }
         let tree_root = ingot_url.clone();
 

crates/fe/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fe"
 version = "0.26.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 clap.workspace = true

crates/fe/src/main.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::print_stderr, clippy::print_stdout)]
 mod check;
 mod tree;
 

crates/fe/src/tree.rs

@@ -3,9 +3,9 @@ use std::collections::HashMap;
 use camino::Utf8PathBuf;
 use common::{config::Config, graph::EdgeWeight, tree::display_dependency_tree};
 use resolver::{
+    ResolutionHandler, Resolver,
     files::{FilesResolver, FilesResource},
     graph::{DiGraph, GraphResolutionHandler, GraphResolver},
-    ResolutionHandler, Resolver,
 };
 use url::Url;
 

crates/fe/tests/cli_output.rs

@@ -1,4 +1,4 @@
-use dir_test::{dir_test, Fixture};
+use dir_test::{Fixture, dir_test};
 use std::process::Command;
 use test_utils::snap_test;
 

crates/hir-analysis/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fe-hir-analysis"
 version = "0.26.0"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/fe"
 description = "Provides HIR semantic analysis for Fe lang"
@@ -15,7 +15,6 @@ cranelift-entity = "0.115"
 derive_more.workspace = true
 either = "1.13"
 ena = { version = "0.14", features = ["persistent"] }
-if_chain = "1.0"
 indexmap = "2.0"
 itertools = "0.14"
 num-bigint.workspace = true

crates/hir-analysis/src/analysis_pass.rs

@@ -1,8 +1,8 @@
-use crate::{diagnostics::DiagnosticVoucher, HirAnalysisDb};
+use crate::{HirAnalysisDb, diagnostics::DiagnosticVoucher};
 use hir::{
+    ParserError,
     hir_def::{ModuleTree, TopLevelMod},
     lower::parse_file_impl,
-    ParserError,
 };
 
 /// All analysis passes that run analysis on the HIR top level module