rust 2024 edition; lots of ifs merged and imports rearranged

Author: sbillig

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 {