Merge branch 'main' into elfedy-compiler-output

klkvr · web-flow · commit cce24d30e61d · 2024-12-02T19:38:02.000+04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,15 +21,17 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        rust: ["stable", "1.70"]
+        rust: ["stable", "1.83"]
         flags: ["", "--all-features"]
         exclude:
           # Skip because some features have higher MSRV.
-          - rust: "1.70" # MSRV
+          - rust: "1.83" # MSRV
             flags: "--all-features"
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
       - name: Install test binaries
         shell: bash
         run: ./.github/scripts/install_test_binaries.sh
@@ -38,11 +40,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - name: build
-        if: matrix.rust == '1.70' # MSRV
-        run: cargo build --workspace ${{ matrix.flags }}
       - name: test
-        if: matrix.rust != '1.70' # MSRV
         shell: bash
         run: cargo nextest run ${{ matrix.flags }} --retries 2
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -74,6 +74,7 @@ cases should be limited, as much as possible, to using only Foundry Compilers AP
 See [How to create a Minimal, Complete, and Verifiable example][mcve].
 
 [mcve]: https://stackoverflow.com/help/mcve
+
 [template]: .github/PULL_REQUEST_TEMPLATE.md
 
 ### Triaging a Bug Report
@@ -120,6 +121,11 @@ commit signing. This option allows us to make small changes to your PR to bring
 it in line with these standards. It helps us get your PR in faster, and with
 less work from you.
 
+### Contributions Related to Spelling and Grammar
+
+At this time, we will not be accepting contributions that only fix spelling or grammatical errors in documentation, code
+or elsewhere.
+
 ### Cargo Commands
 
 This section lists some commonly needed commands.
@@ -304,5 +310,7 @@ the commit log, or by using an `Author: ` meta-data tag in the commit.
 _Adapted from the [Tokio contributing guide]_.
 
 [hiding-a-comment]: https://help.github.com/articles/managing-disruptive-comments/#hiding-a-comment
+
 [documentation test]: https://doc.rust-lang.org/rustdoc/documentation-tests.html
+
 [Tokio contributing guide]: https://github.com/tokio-rs/tokio/blob/master/CONTRIBUTING.md
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 authors = ["Foundry Maintainers"]
 version = "0.12.3"
-rust-version = "1.70"
+rust-version = "1.83"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/foundry-rs/compilers"
@@ -43,7 +43,6 @@ cfg-if = "1.0"
 dunce = "1.0"
 md-5 = "0.10"
 memmap2 = "0.9"
-once_cell = "1.19"
 path-slash = "0.2"
 rayon = "1.8"
 regex = "1.10"
@@ -54,7 +53,7 @@ similar-asserts = "1"
 solar-parse = { version = "=0.1.0", default-features = false }
 svm = { package = "svm-rs", version = "0.5", default-features = false }
 tempfile = "3.9"
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 walkdir = "2.5"
 yansi = "1.0"
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ When updating this, also update:
 
 Foundry Compilers will keep a rolling MSRV (minimum supported rust version) policy of **at
 least** 6 months. When increasing the MSRV, the new Rust version must have been
-released at least six months ago. The current MSRV is 1.70.0.
+released at least six months ago. The current MSRV is 1.83.0.
 
 Note that the MSRV is not increased automatically, and only as part of a minor
 release.
diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-msrv = "1.70"
+msrv = "1.83"
diff --git a/crates/artifacts/solc/src/error.rs b/crates/artifacts/solc/src/error.rs
@@ -150,9 +150,11 @@ impl fmt::Display for Error {
         // unless it also contains a source location, in which case the entire error message is an
         // old style error message, like:
         //     path/to/file:line:column: ErrorType: message
-        if lines.clone().next().map_or(false, |l| {
-            l.contains(short_msg) && l.bytes().filter(|b| *b == b':').count() < 3
-        }) {
+        if lines
+            .clone()
+            .next()
+            .is_some_and(|l| l.contains(short_msg) && l.bytes().filter(|b| *b == b':').count() < 3)
+        {
             let _ = lines.next();
         }
 
diff --git a/crates/artifacts/solc/src/lib.rs b/crates/artifacts/solc/src/lib.rs
@@ -110,9 +110,9 @@ impl SolcInput {
         let mut yul_sources = Sources::new();
 
         for (file, source) in sources {
-            if file.extension().map_or(false, |e| e == "yul") {
+            if file.extension().is_some_and(|e| e == "yul") {
                 yul_sources.insert(file, source);
-            } else if file.extension().map_or(false, |e| e == "sol") {
+            } else if file.extension().is_some_and(|e| e == "sol") {
                 solidity_sources.insert(file, source);
             }
         }
diff --git a/crates/artifacts/solc/src/output_selection.rs b/crates/artifacts/solc/src/output_selection.rs
@@ -149,9 +149,9 @@ impl OutputSelection {
     /// TODO: correctly process wildcard keys to reduce false negatives
     pub fn is_subset_of(&self, other: &Self) -> bool {
         self.0.iter().all(|(file, selection)| {
-            other.0.get(file).map_or(false, |other_selection| {
+            other.0.get(file).is_some_and(|other_selection| {
                 selection.iter().all(|(contract, outputs)| {
-                    other_selection.get(contract).map_or(false, |other_outputs| {
+                    other_selection.get(contract).is_some_and(|other_outputs| {
                         outputs.iter().all(|output| other_outputs.contains(output))
                     })
                 })
diff --git a/crates/artifacts/vyper/src/input.rs b/crates/artifacts/vyper/src/input.rs
@@ -22,7 +22,7 @@ impl VyperInput {
         let mut interfaces = Sources::new();
 
         for (path, content) in sources {
-            if path.extension().map_or(false, |ext| ext == VYPER_INTERFACE_EXTENSION) {
+            if path.extension().is_some_and(|ext| ext == VYPER_INTERFACE_EXTENSION) {
                 // Interface .vyi files should be removed from the output selection.
                 settings.output_selection.0.remove(path.to_string_lossy().as_ref());
                 interfaces.insert(path, content);
diff --git a/crates/compilers/Cargo.toml b/crates/compilers/Cargo.toml
@@ -29,7 +29,6 @@ thiserror.workspace = true
 path-slash.workspace = true
 yansi.workspace = true
 solar-parse.workspace = true
-once_cell = { workspace = true, optional = true }
 futures-util = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 
@@ -85,7 +84,6 @@ svm-solc = [
     "dep:svm-builds",
     "dep:sha2",
     "foundry-compilers-core/svm-solc",
-    "dep:once_cell",
 ]
 # Utilities for creating and testing project workspaces.
 project-util = [
diff --git a/crates/compilers/src/cache.rs b/crates/compilers/src/cache.rs
@@ -616,7 +616,7 @@ impl GroupedSources {
 
     /// Returns true if the file was included with the given version.
     pub fn contains(&self, file: &Path, version: &Version) -> bool {
-        self.inner.get(file).map_or(false, |versions| versions.contains(version))
+        self.inner.get(file).is_some_and(|versions| versions.contains(version))
     }
 }
 
@@ -789,9 +789,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
 
         let mut dirty_profiles = HashSet::new();
         for (profile, settings) in &self.cache.profiles {
-            if !existing_profiles
-                .get(profile.as_str())
-                .map_or(false, |p| p.can_use_cached(settings))
+            if !existing_profiles.get(profile.as_str()).is_some_and(|p| p.can_use_cached(settings))
             {
                 trace!("dirty profile: {}", profile);
                 dirty_profiles.insert(profile.clone());
diff --git a/crates/compilers/src/compile/output/mod.rs b/crates/compilers/src/compile/output/mod.rs
@@ -878,7 +878,7 @@ impl<C: Compiler> AggregatedCompilerOutput<C> {
 
         self.contracts.contracts_with_files().filter(|(path, _, _)| *path == contract_path).any(
             |(_, _, contract)| {
-                contract.abi_ref().map_or(false, |abi| abi.functions.contains_key("IS_TEST"))
+                contract.abi_ref().is_some_and(|abi| abi.functions.contains_key("IS_TEST"))
             },
         )
     }
diff --git a/crates/compilers/src/compilers/solc/compiler.rs b/crates/compilers/src/compilers/solc/compiler.rs
@@ -45,8 +45,8 @@ macro_rules! take_solc_installer_lock {
 /// we should download.
 /// The boolean value marks whether there was an error accessing the release list
 #[cfg(feature = "svm-solc")]
-pub static RELEASES: once_cell::sync::Lazy<(svm::Releases, Vec<Version>, bool)> =
-    once_cell::sync::Lazy::new(|| {
+pub static RELEASES: std::sync::LazyLock<(svm::Releases, Vec<Version>, bool)> =
+    std::sync::LazyLock::new(|| {
         match serde_json::from_str::<svm::Releases>(svm_builds::RELEASE_LIST_JSON) {
             Ok(releases) => {
                 let sorted_versions = releases.clone().into_versions();
diff --git a/crates/compilers/src/compilers/solc/mod.rs b/crates/compilers/src/compilers/solc/mod.rs
@@ -206,8 +206,8 @@ impl<V: Ord + Copy> Restriction<V> {
     ///
     /// If given None, only returns true if no restrictions are set
     pub fn satisfies(&self, value: Option<V>) -> bool {
-        self.min.map_or(true, |min| value.map_or(false, |v| v >= min))
-            && self.max.map_or(true, |max| value.map_or(false, |v| v <= max))
+        self.min.is_none_or(|min| value.is_some_and(|v| v >= min))
+            && self.max.is_none_or(|max| value.is_some_and(|v| v <= max))
     }
 
     /// Combines two restrictions into a new one
@@ -351,7 +351,7 @@ impl CompilerSettings for SolcSettings {
         // Ensure that we either don't have min optimizer runs set or that the optimizer is enabled
         satisfies &= optimizer_runs
             .min
-            .map_or(true, |min| min == 0 || self.optimizer.enabled.unwrap_or_default());
+            .is_none_or(|min| min == 0 || self.optimizer.enabled.unwrap_or_default());
 
         satisfies
     }
diff --git a/crates/compilers/src/filter.rs b/crates/compilers/src/filter.rs
@@ -142,7 +142,7 @@ impl<'a> SparseOutputFilter<'a> {
             .collect();
 
         // Remove clean sources, those will be read from cache.
-        full_compilation.retain(|file| sources.0.get(file).map_or(false, |s| s.is_dirty()));
+        full_compilation.retain(|file| sources.0.get(file).is_some_and(|s| s.is_dirty()));
 
         settings.update_output_selection(|selection| {
             trace!(
diff --git a/crates/compilers/src/lib.rs b/crates/compilers/src/lib.rs
@@ -406,7 +406,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler> Pro
     {
         let mut contracts = self.collect_contract_names()?;
 
-        if contracts.get(target_name).map_or(true, |paths| paths.is_empty()) {
+        if contracts.get(target_name).is_none_or(|paths| paths.is_empty()) {
             return Err(SolcError::msg(format!("No contract found with the name `{target_name}`")));
         }
         let mut paths = contracts.remove(target_name).unwrap();
diff --git a/crates/compilers/src/resolver/parse.rs b/crates/compilers/src/resolver/parse.rs
@@ -45,7 +45,7 @@ impl SolData {
     /// This will attempt to parse the solidity AST and extract the imports and version pragma. If
     /// parsing fails, we'll fall back to extract that info via regex
     pub fn parse(content: &str, file: &Path) -> Self {
-        let is_yul = file.extension().map_or(false, |ext| ext == "yul");
+        let is_yul = file.extension().is_some_and(|ext| ext == "yul");
         let mut version = None;
         let mut experimental = None;
         let mut imports = Vec::<Spanned<SolImport>>::new();
@@ -133,6 +133,11 @@ impl SolData {
             if imports.is_empty() {
                 imports = capture_imports(content);
             }
+            if contract_names.is_empty() {
+                utils::RE_CONTRACT_NAMES.captures_iter(content).for_each(|cap| {
+                    contract_names.push(cap[1].to_owned());
+                });
+            }
         }
         let license = content.lines().next().and_then(|line| {
             utils::capture_outer_and_inner(
@@ -313,6 +318,12 @@ mod tests {
         assert_eq!(data.version_req, version_req.map(|v| v.parse().unwrap()), "src:\n{src}");
     }
 
+    #[track_caller]
+    fn assert_contract_names(names: &[&str], src: &str) {
+        let data = SolData::parse(src, "test.sol".as_ref());
+        assert_eq!(data.contract_names, names, "src:\n{src}");
+    }
+
     #[test]
     fn soldata_parsing() {
         assert_version(None, "");
@@ -332,6 +343,18 @@ contract BugReport {
 }
         "#,
         );
+
+        assert_contract_names(
+            &["A", "B69$_", "C_", "$D"],
+            r#"
+    contract A {}
+library B69$_ {}
+abstract contract C_ {} interface $D {}
+
+uint constant x = .1e10;
+uint constant y = .1 ether;
+        "#,
+        );
     }
 
     #[test]
diff --git a/crates/compilers/tests/project.rs b/crates/compilers/tests/project.rs
@@ -30,7 +30,6 @@ use foundry_compilers_core::{
     error::SolcError,
     utils::{self, canonicalize, RuntimeOrHandle},
 };
-use once_cell::sync::Lazy;
 use semver::Version;
 use similar_asserts::assert_eq;
 use std::{
@@ -39,10 +38,11 @@ use std::{
     io,
     path::{Path, PathBuf, MAIN_SEPARATOR},
     str::FromStr,
+    sync::LazyLock,
 };
 use svm::{platform, Platform};
 
-pub static VYPER: Lazy<Vyper> = Lazy::new(|| {
+pub static VYPER: LazyLock<Vyper> = LazyLock::new(|| {
     RuntimeOrHandle::new().block_on(async {
         #[cfg(target_family = "unix")]
         use std::{fs::Permissions, os::unix::fs::PermissionsExt};
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -18,7 +18,6 @@ workspace = true
 alloy-primitives.workspace = true
 cfg-if.workspace = true
 dunce.workspace = true
-once_cell.workspace = true
 path-slash.workspace = true
 regex.workspace = true
 semver.workspace = true
diff --git a/crates/core/src/utils.rs b/crates/core/src/utils.rs
@@ -3,7 +3,6 @@
 use crate::error::{SolcError, SolcIoError};
 use alloy_primitives::{hex, keccak256};
 use cfg_if::cfg_if;
-use once_cell::sync::Lazy;
 use regex::{Match, Regex};
 use semver::{Version, VersionReq};
 use serde::{de::DeserializeOwned, Serialize};
@@ -13,6 +12,7 @@ use std::{
     io::Write,
     ops::Range,
     path::{Component, Path, PathBuf},
+    sync::LazyLock as Lazy,
 };
 use walkdir::WalkDir;
 
@@ -46,6 +46,11 @@ pub static RE_THREE_OR_MORE_NEWLINES: Lazy<Regex> = Lazy::new(|| Regex::new("\n{
 pub static RE_VYPER_VERSION: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"#(?:pragma version|@version)\s+(?P<version>.+)").unwrap());
 
+/// A regex that matches the contract names in a Solidity file.
+pub static RE_CONTRACT_NAMES: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r"\b(?:contract|library|abstract\s+contract|interface)\s+([\w$]+)").unwrap()
+});
+
 /// Extensions acceptable by solc compiler.
 pub const SOLC_EXTENSIONS: &[&str] = &["sol", "yul"];
 

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,9 @@ impl SolcInput {`
`110`	`110`	`let mut yul_sources = Sources::new();`
`111`	`111`
`112`	`112`	`for (file, source) in sources {`
`113`		`- if file.extension().map_or(false, \|e\| e == "yul") {`
	`113`	`+ if file.extension().is_some_and(\|e\| e == "yul") {`
`114`	`114`	`yul_sources.insert(file, source);`
`115`		`- } else if file.extension().map_or(false, \|e\| e == "sol") {`
	`115`	`+ } else if file.extension().is_some_and(\|e\| e == "sol") {`
`116`	`116`	`solidity_sources.insert(file, source);`
`117`	`117`	`}`
`118`	`118`	`}`