simplify outputSelection

Author: hedgar2017

Cargo.lock

@@ -36,10 +36,10 @@ pub use self::process::EXECUTABLE;
 pub use self::project::contract::Contract as ProjectContract;
 pub use self::project::Project;
 pub use self::r#const::*;
-pub use self::solc::codegen::Codegen as SolcCodegen;
 pub use self::solc::combined_json::contract::Contract as SolcCombinedJsonContract;
 pub use self::solc::combined_json::CombinedJson as SolcCombinedJson;
 pub use self::solc::standard_json::input::language::Language as SolcStandardJsonInputLanguage;
+pub use self::solc::standard_json::input::settings::codegen::Codegen as SolcStandardJsonInputSettingsCodegen;
 pub use self::solc::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
 pub use self::solc::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
 pub use self::solc::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
@@ -254,7 +254,7 @@ pub fn standard_output_eravm(
     libraries: Vec<String>,
     solc_compiler: &SolcCompiler,
     messages: &mut Vec<SolcStandardJsonOutputError>,
-    codegen: Option<SolcCodegen>,
+    codegen: Option<SolcStandardJsonInputSettingsCodegen>,
     evm_version: Option<era_compiler_common::EVMVersion>,
     enable_eravm_extensions: bool,
     metadata_hash_type: era_compiler_common::HashType,
@@ -272,7 +272,7 @@ pub fn standard_output_eravm(
     debug_config: Option<era_compiler_llvm_context::DebugConfig>,
 ) -> anyhow::Result<EraVMBuild> {
     let solc_version = solc_compiler.version.to_owned();
-    let solc_codegen = SolcCodegen::new(&solc_version, codegen);
+    let solc_codegen = SolcStandardJsonInputSettingsCodegen::new(&solc_version, codegen);
 
     let mut solc_input = SolcStandardJsonInput::try_from_solidity_paths(
         paths,
@@ -282,7 +282,7 @@ pub fn standard_output_eravm(
         codegen,
         evm_version,
         enable_eravm_extensions,
-        SolcStandardJsonInputSettingsSelection::new_required(Some(solc_codegen)),
+        SolcStandardJsonInputSettingsSelection::new_required(solc_codegen),
         SolcStandardJsonInputSettingsMetadata::new(use_literal_content, metadata_hash_type),
         llvm_options.clone(),
         suppressed_errors,
@@ -333,7 +333,7 @@ pub fn standard_output_evm(
     libraries: Vec<String>,
     solc_compiler: &SolcCompiler,
     messages: &mut Vec<SolcStandardJsonOutputError>,
-    codegen: Option<SolcCodegen>,
+    codegen: Option<SolcStandardJsonInputSettingsCodegen>,
     evm_version: Option<era_compiler_common::EVMVersion>,
     metadata_hash_type: era_compiler_common::HashType,
     use_literal_content: bool,
@@ -347,7 +347,7 @@ pub fn standard_output_evm(
     debug_config: Option<era_compiler_llvm_context::DebugConfig>,
 ) -> anyhow::Result<EVMBuild> {
     let solc_version = solc_compiler.version.to_owned();
-    let solc_codegen = SolcCodegen::new(&solc_version, codegen);
+    let solc_codegen = SolcStandardJsonInputSettingsCodegen::new(&solc_version, codegen);
 
     let mut solc_input = SolcStandardJsonInput::try_from_solidity_paths(
         paths,
@@ -357,7 +357,7 @@ pub fn standard_output_evm(
         codegen,
         evm_version,
         false,
-        SolcStandardJsonInputSettingsSelection::new_required(Some(solc_codegen)),
+        SolcStandardJsonInputSettingsSelection::new_required(solc_codegen),
         SolcStandardJsonInputSettingsMetadata::new(use_literal_content, metadata_hash_type),
         llvm_options.clone(),
         vec![],
@@ -403,7 +403,7 @@ pub fn standard_output_evm(
 ///
 pub fn standard_json_eravm(
     solc_compiler: Option<SolcCompiler>,
-    codegen: Option<SolcCodegen>,
+    codegen: Option<SolcStandardJsonInputSettingsCodegen>,
     enable_eravm_extensions: bool,
     detect_missing_libraries: bool,
     json_path: Option<PathBuf>,
@@ -424,7 +424,7 @@ pub fn standard_json_eravm(
     let llvm_options = solc_input.settings.llvm_options.clone();
 
     let codegen = if solc_input.settings.force_evmla {
-        Some(SolcCodegen::EVMLA)
+        Some(SolcStandardJsonInputSettingsCodegen::EVMLA)
     } else {
         codegen
     };
@@ -445,8 +445,9 @@ pub fn standard_json_eravm(
                 None => SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME)?,
             };
 
-            let solc_codegen = SolcCodegen::new(&solc_compiler.version, codegen);
-            solc_input.normalize(Some(solc_codegen));
+            let solc_codegen =
+                SolcStandardJsonInputSettingsCodegen::new(&solc_compiler.version, codegen);
+            solc_input.normalize(solc_codegen);
 
             let mut solc_output = solc_compiler.standard_json(
                 &mut solc_input,
@@ -565,7 +566,7 @@ pub fn standard_json_eravm(
 ///
 pub fn standard_json_evm(
     solc_compiler: Option<SolcCompiler>,
-    codegen: Option<SolcCodegen>,
+    codegen: Option<SolcStandardJsonInputSettingsCodegen>,
     json_path: Option<PathBuf>,
     messages: &mut Vec<SolcStandardJsonOutputError>,
     base_path: Option<String>,
@@ -592,8 +593,9 @@ pub fn standard_json_evm(
                 None => SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME)?,
             };
 
-            let solc_codegen = SolcCodegen::new(&solc_compiler.version, codegen);
-            solc_input.normalize(Some(solc_codegen));
+            let solc_codegen =
+                SolcStandardJsonInputSettingsCodegen::new(&solc_compiler.version, codegen);
+            solc_input.normalize(solc_codegen);
 
             let mut solc_output = solc_compiler.standard_json(
                 &mut solc_input,
@@ -696,7 +698,7 @@ pub fn combined_json_eravm(
     libraries: Vec<String>,
     solc_compiler: &SolcCompiler,
     messages: &mut Vec<SolcStandardJsonOutputError>,
-    codegen: Option<SolcCodegen>,
+    codegen: Option<SolcStandardJsonInputSettingsCodegen>,
     evm_version: Option<era_compiler_common::EVMVersion>,
     enable_eravm_extensions: bool,
     metadata_hash_type: era_compiler_common::HashType,
@@ -767,7 +769,7 @@ pub fn combined_json_evm(
     libraries: Vec<String>,
     solc_compiler: &SolcCompiler,
     messages: &mut Vec<SolcStandardJsonOutputError>,
-    codegen: Option<SolcCodegen>,
+    codegen: Option<SolcStandardJsonInputSettingsCodegen>,
     evm_version: Option<era_compiler_common::EVMVersion>,
     metadata_hash_type: era_compiler_common::HashType,
     use_literal_content: bool,