Merge branch 'main' of github.com:foundry-rs/compilers into elfedy-compiler-output

Author: elfedy

CHANGELOG.md

@@ -5,6 +5,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.12.1](https://github.com/foundry-rs/compilers/releases/tag/v0.12.1) - 2024-11-18
+
+### Bug Fixes
+
+- `collect_contract_names` ([#221](https://github.com/foundry-rs/compilers/issues/221))
+
+## [0.12.0](https://github.com/foundry-rs/compilers/releases/tag/v0.12.0) - 2024-11-18
+
+### Bug Fixes
+
+- Sanitize `settings.optimizer.details.inliner` ([#216](https://github.com/foundry-rs/compilers/issues/216))
+- [tests] Always try installing pinned solc ([#217](https://github.com/foundry-rs/compilers/issues/217))
+- Outdated merge build error
+
+### Features
+
+- Allow multiple compiler configs ([#170](https://github.com/foundry-rs/compilers/issues/170))
+- Replace solang with solar ([#215](https://github.com/foundry-rs/compilers/issues/215))
+
+### Miscellaneous Tasks
+
+- Release 0.12.0
+- Remove outdated `ref` patterns ([#218](https://github.com/foundry-rs/compilers/issues/218))
+- Inline constants in Settings::sanitize ([#219](https://github.com/foundry-rs/compilers/issues/219))
+- Use Version::new over .parse ([#220](https://github.com/foundry-rs/compilers/issues/220))
+
 ## [0.11.6](https://github.com/foundry-rs/compilers/releases/tag/v0.11.6) - 2024-10-16
 
 ### Bug Fixes
@@ -14,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Miscellaneous Tasks
 
+- Release 0.11.6
 - Release 0.11.5
 - Allow adding vyper sources with `add_raw_source` w/ `.vy` / `.vyi` extension ([#211](https://github.com/foundry-rs/compilers/issues/211))
 - [`ci`] Fix deny (add `ZLib` exception) ([#212](https://github.com/foundry-rs/compilers/issues/212))

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Foundry Maintainers"]
-version = "0.11.6"
+version = "0.12.1"
 rust-version = "1.70"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
@@ -31,11 +31,11 @@ unused-must-use = "deny"
 all = "warn"
 
 [workspace.dependencies]
-foundry-compilers = { path = "crates/compilers", version = "0.11.6" }
-foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.11.6" }
-foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.11.6" }
-foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.11.6" }
-foundry-compilers-core = { path = "crates/core", version = "0.11.6" }
+foundry-compilers = { path = "crates/compilers", version = "0.12.1" }
+foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.12.1" }
+foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.12.1" }
+foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.12.1" }
+foundry-compilers-core = { path = "crates/core", version = "0.12.1" }
 
 alloy-json-abi = { version = "0.8", features = ["serde_json"] }
 alloy-primitives = { version = "0.8", features = ["serde", "rand"] }

crates/artifacts/solc/src/bytecode.rs

@@ -303,7 +303,7 @@ impl BytecodeObject {
     ///
     /// See also: <https://docs.soliditylang.org/en/develop/using-the-compiler.html#library-linking>
     pub fn link_fully_qualified(&mut self, name: &str, addr: Address) -> &mut Self {
-        if let Self::Unlinked(ref mut unlinked) = self {
+        if let Self::Unlinked(unlinked) = self {
             let place_holder = utils::library_hash_placeholder(name);
             // the address as hex without prefix
             let hex_addr = hex::encode(addr);

crates/artifacts/solc/src/contract.rs

@@ -48,7 +48,7 @@ pub struct Contract {
 
 impl<'a> From<&'a Contract> for CompactContractBytecodeCow<'a> {
     fn from(artifact: &'a Contract) -> Self {
-        let (bytecode, deployed_bytecode) = if let Some(ref evm) = artifact.evm {
+        let (bytecode, deployed_bytecode) = if let Some(evm) = &artifact.evm {
             (
                 evm.bytecode.clone().map(Into::into).map(Cow::Owned),
                 evm.deployed_bytecode.clone().map(Into::into).map(Cow::Owned),
@@ -523,7 +523,7 @@ impl<'a> CompactContractRef<'a> {
 
 impl<'a> From<&'a Contract> for CompactContractRef<'a> {
     fn from(c: &'a Contract) -> Self {
-        let (bin, bin_runtime) = if let Some(ref evm) = c.evm {
+        let (bin, bin_runtime) = if let Some(evm) = &c.evm {
             (
                 evm.bytecode.as_ref().map(|c| &c.object),
                 evm.deployed_bytecode

crates/artifacts/solc/src/lib.rs

@@ -297,8 +297,7 @@ impl Settings {
 
     /// This will remove/adjust values in the settings that are not compatible with this version.
     pub fn sanitize(&mut self, version: &Version, language: SolcLanguage) {
-        const V0_6_0: Version = Version::new(0, 6, 0);
-        if *version < V0_6_0 {
+        if *version < Version::new(0, 6, 0) {
             if let Some(meta) = &mut self.metadata {
                 // introduced in <https://docs.soliditylang.org/en/v0.6.0/using-the-compiler.html#compiler-api>
                 // missing in <https://docs.soliditylang.org/en/v0.5.17/using-the-compiler.html#compiler-api>
@@ -308,22 +307,26 @@ impl Settings {
             self.debug = None;
         }
 
-        const V0_7_5: Version = Version::new(0, 7, 5);
-        if *version < V0_7_5 {
+        if *version < Version::new(0, 7, 5) {
             // introduced in 0.7.5 <https://github.com/ethereum/solidity/releases/tag/v0.7.5>
             self.via_ir = None;
         }
 
-        const V0_8_7: Version = Version::new(0, 8, 7);
-        if *version < V0_8_7 {
+        if *version < Version::new(0, 8, 5) {
+            // introduced in 0.8.5 <https://github.com/ethereum/solidity/releases/tag/v0.8.5>
+            if let Some(optimizer_details) = &mut self.optimizer.details {
+                optimizer_details.inliner = None;
+            }
+        }
+
+        if *version < Version::new(0, 8, 7) {
             // lower the disable version from 0.8.10 to 0.8.7, due to `divModNoSlacks`,
             // `showUnproved` and `solvers` are implemented
             // introduced in <https://github.com/ethereum/solidity/releases/tag/v0.8.7>
             self.model_checker = None;
         }
 
-        const V0_8_10: Version = Version::new(0, 8, 10);
-        if *version < V0_8_10 {
+        if *version < Version::new(0, 8, 10) {
             if let Some(debug) = &mut self.debug {
                 // introduced in <https://docs.soliditylang.org/en/v0.8.10/using-the-compiler.html#compiler-api>
                 // <https://github.com/ethereum/solidity/releases/tag/v0.8.10>
@@ -336,8 +339,7 @@ impl Settings {
             }
         }
 
-        const V0_8_18: Version = Version::new(0, 8, 18);
-        if *version < V0_8_18 {
+        if *version < Version::new(0, 8, 18) {
             // introduced in 0.8.18 <https://github.com/ethereum/solidity/releases/tag/v0.8.18>
             if let Some(meta) = &mut self.metadata {
                 meta.cbor_metadata = None;
@@ -351,23 +353,26 @@ impl Settings {
             }
         }
 
-        if *version < SHANGHAI_SOLC {
+        if *version < Version::new(0, 8, 20) {
             // introduced in 0.8.20 <https://github.com/ethereum/solidity/releases/tag/v0.8.20>
             if let Some(model_checker) = &mut self.model_checker {
                 model_checker.show_proved_safe = None;
                 model_checker.show_unsupported = None;
             }
         }
 
-        if let Some(ref mut evm_version) = self.evm_version {
+        if let Some(evm_version) = self.evm_version {
             self.evm_version = evm_version.normalize_version_solc(version);
         }
 
-        if language == SolcLanguage::Yul {
-            if !self.remappings.is_empty() {
-                warn!("omitting remappings supplied for the yul sources");
+        match language {
+            SolcLanguage::Solidity => {}
+            SolcLanguage::Yul => {
+                if !self.remappings.is_empty() {
+                    warn!("omitting remappings supplied for the yul sources");
+                }
+                self.remappings = Vec::new();
             }
-            self.remappings = Vec::new();
         }
     }
 
@@ -2025,25 +2030,20 @@ mod tests {
 
     #[test]
     fn can_sanitize_byte_code_hash() {
-        let version: Version = "0.6.0".parse().unwrap();
-
         let settings = Settings { metadata: Some(BytecodeHash::Ipfs.into()), ..Default::default() };
 
         let input =
             SolcInput { language: SolcLanguage::Solidity, sources: Default::default(), settings };
 
-        let i = input.clone().sanitized(&version);
+        let i = input.clone().sanitized(&Version::new(0, 6, 0));
         assert_eq!(i.settings.metadata.unwrap().bytecode_hash, Some(BytecodeHash::Ipfs));
 
-        let version: Version = "0.5.17".parse().unwrap();
-        let i = input.sanitized(&version);
+        let i = input.sanitized(&Version::new(0, 5, 17));
         assert!(i.settings.metadata.unwrap().bytecode_hash.is_none());
     }
 
     #[test]
     fn can_sanitize_cbor_metadata() {
-        let version: Version = "0.8.18".parse().unwrap();
-
         let settings = Settings {
             metadata: Some(SettingsMetadata::new(BytecodeHash::Ipfs, true)),
             ..Default::default()
@@ -2052,7 +2052,7 @@ mod tests {
         let input =
             SolcInput { language: SolcLanguage::Solidity, sources: Default::default(), settings };
 
-        let i = input.clone().sanitized(&version);
+        let i = input.clone().sanitized(&Version::new(0, 8, 18));
         assert_eq!(i.settings.metadata.unwrap().cbor_metadata, Some(true));
 
         let i = input.sanitized(&Version::new(0, 8, 0));
@@ -2221,4 +2221,19 @@ mod tests {
         let content = fs::read_to_string(path).unwrap();
         let _output: CompilerOutput = serde_json::from_str(&content).unwrap();
     }
+
+    // <https://github.com/foundry-rs/foundry/issues/9322>
+    #[test]
+    fn can_sanitize_optimizer_inliner() {
+        let settings = Settings::default().with_via_ir_minimum_optimization();
+
+        let input =
+            SolcInput { language: SolcLanguage::Solidity, sources: Default::default(), settings };
+
+        let i = input.clone().sanitized(&Version::new(0, 8, 4));
+        assert!(i.settings.optimizer.details.unwrap().inliner.is_none());
+
+        let i = input.sanitized(&Version::new(0, 8, 5));
+        assert_eq!(i.settings.optimizer.details.unwrap().inliner, Some(false));
+    }
 }

crates/compilers/src/compile/output/info.rs

@@ -44,11 +44,10 @@ impl ContractInfo {
 
 impl fmt::Display for ContractInfo {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if let Some(ref path) = self.path {
-            write!(f, "{path}:{}", self.name)
-        } else {
-            write!(f, "{}", self.name)
+        if let Some(path) = &self.path {
+            write!(f, "{path}:")?;
         }
+        f.write_str(&self.name)
     }
 }
 

crates/compilers/src/compile/output/mod.rs

@@ -917,13 +917,12 @@ impl<C: Compiler> fmt::Display for OutputDiagnostics<'_, C> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str("Compiler run ")?;
         if self.has_error() {
-            Paint::red("failed:")
+            write!(f, "{}:", "failed".red())
         } else if self.has_warning() {
-            Paint::yellow("successful with warnings:")
+            write!(f, "{}:", "successful with warnings".yellow())
         } else {
-            Paint::green("successful!")
-        }
-        .fmt(f)?;
+            write!(f, "{}!", "successful".green())
+        }?;
 
         for err in &self.compiler_output.errors {
             if !self.compiler_output.should_ignore(

crates/compilers/src/compilers/solc/mod.rs

@@ -465,7 +465,7 @@ mod tests {
             metadata: Default::default(),
         };
 
-        let v: Version = "0.8.12".parse().unwrap();
+        let v = Version::new(0, 8, 12);
         let input = SolcVersionedInput::build(
             Default::default(),
             Default::default(),

crates/compilers/src/lib.rs

@@ -49,10 +49,12 @@ use cache::CompilerCache;
 use compile::output::contracts::VersionedContracts;
 use compilers::multi::MultiCompiler;
 use derivative::Derivative;
-use foundry_compilers_artifacts::solc::{
+use foundry_compilers_artifacts::{
     output_selection::OutputSelection,
-    sources::{Source, SourceCompilationKind, Sources},
-    Severity, SourceFile, StandardJsonCompilerInput,
+    solc::{
+        sources::{Source, SourceCompilationKind, Sources},
+        Severity, SourceFile, StandardJsonCompilerInput,
+    },
 };
 use foundry_compilers_core::error::{Result, SolcError, SolcIoError};
 use output::sources::{VersionedSourceFile, VersionedSourceFiles};
@@ -383,7 +385,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler> Pro
         let graph = Graph::<C::ParsedSource>::resolve(&self.paths)?;
         let mut contracts: HashMap<String, Vec<PathBuf>> = HashMap::new();
         if !graph.is_empty() {
-            for node in graph.nodes(0) {
+            for node in &graph.nodes {
                 for contract_name in node.data.contract_names() {
                     contracts
                         .entry(contract_name.clone())

crates/compilers/src/project_util/mod.rs

@@ -63,9 +63,8 @@ impl<
     pub fn set_solc(&mut self, solc: &str) -> &mut Self {
         use crate::solc::{Solc, SolcCompiler};
 
-        self.inner.compiler.solc = Some(SolcCompiler::Specific(
-            Solc::find_svm_installed_version(&solc.parse().unwrap()).unwrap().unwrap(),
-        ));
+        self.inner.compiler.solc =
+            Some(SolcCompiler::Specific(Solc::find_or_install(&solc.parse().unwrap()).unwrap()));
 
         self
     }