trigger LLVM IR and EraVM assembly project errors

Author: hedgar2017

.gitignore

@@ -22,4 +22,5 @@
 *.bak
 
 # Test solc versions
-solc-bin/
+**/solc-bin/
+**/solc-bin-upstream/

Cargo.lock

@@ -18,6 +18,7 @@ doctest = false
 structopt = { version = "=0.3.26", default-features = false }
 thiserror = "=1.0.64"
 anyhow = "=1.0.89"
+boolinator = "=2.4.0"
 which = "=6.0.3"
 path-slash = "=0.2.1"
 normpath = "=1.3.0"

era-compiler-solidity/Cargo.toml

@@ -113,23 +113,23 @@ impl Build {
         standard_json: &mut StandardJsonOutput,
         solc_version: Option<&SolcVersion>,
     ) -> anyhow::Result<()> {
-        let standard_json_contracts = standard_json.contracts.get_or_insert_with(BTreeMap::new);
         let mut errors = Vec::with_capacity(self.contracts.len());
         for (full_path, build) in self.contracts.into_iter() {
             let mut full_path_split = full_path.split(':');
             let path = full_path_split.next().expect("Always exists");
             let name = full_path_split.next().unwrap_or(path);
 
             match build {
-                Ok(build) => match standard_json_contracts
+                Ok(build) => match standard_json
+                    .contracts
                     .get_mut(path)
                     .and_then(|contracts| contracts.get_mut(name))
                 {
                     Some(contract) => {
                         build.write_to_standard_json(contract)?;
                     }
                     None => {
-                        let contracts = standard_json_contracts.entry(path.to_owned()).or_default();
+                        let contracts = standard_json.contracts.entry(path.to_owned()).or_default();
                         let mut contract = StandardJsonOutputContract::default();
                         build.write_to_standard_json(&mut contract)?;
                         contracts.insert(name.to_owned(), contract);
@@ -139,10 +139,7 @@ impl Build {
             }
         }
 
-        standard_json
-            .errors
-            .get_or_insert_with(Vec::new)
-            .extend(errors);
+        standard_json.errors.extend(errors);
         if let Some(solc_version) = solc_version {
             standard_json.version = Some(solc_version.default.to_string());
             standard_json.long_version = Some(solc_version.long.to_owned());

era-compiler-solidity/src/build_eravm/mod.rs

@@ -116,23 +116,23 @@ impl Build {
         standard_json: &mut StandardJsonOutput,
         solc_version: Option<&SolcVersion>,
     ) -> anyhow::Result<()> {
-        let standard_json_contracts = standard_json.contracts.get_or_insert_with(BTreeMap::new);
         let mut errors = Vec::with_capacity(self.contracts.len());
         for (full_path, build) in self.contracts.into_iter() {
             let mut full_path_split = full_path.split(':');
             let path = full_path_split.next().expect("Always exists");
             let name = full_path_split.next().unwrap_or(path);
 
             match build {
-                Ok(build) => match standard_json_contracts
+                Ok(build) => match standard_json
+                    .contracts
                     .get_mut(path)
                     .and_then(|contracts| contracts.get_mut(name))
                 {
                     Some(contract) => {
                         build.write_to_standard_json(contract)?;
                     }
                     None => {
-                        let contracts = standard_json_contracts.entry(path.to_owned()).or_default();
+                        let contracts = standard_json.contracts.entry(path.to_owned()).or_default();
                         let mut contract = StandardJsonOutputContract::default();
                         build.write_to_standard_json(&mut contract)?;
                         contracts.insert(name.to_owned(), contract);
@@ -142,10 +142,7 @@ impl Build {
             }
         }
 
-        standard_json
-            .errors
-            .get_or_insert_with(Vec::new)
-            .extend(errors);
+        standard_json.errors.extend(errors);
         if let Some(solc_version) = solc_version {
             standard_json.version = Some(solc_version.default.to_string());
             standard_json.long_version = Some(solc_version.long.to_owned());