diff --git a/crates/solidity/src/lib.rs b/crates/solidity/src/lib.rs index c1373f7..a6470e0 100644 --- a/crates/solidity/src/lib.rs +++ b/crates/solidity/src/lib.rs @@ -28,9 +28,9 @@ pub use self::solc::combined_json::contract::Contract as SolcCombinedJsonContrac pub use self::solc::combined_json::CombinedJson as SolcCombinedJson; pub use self::solc::pipeline::Pipeline as SolcPipeline; #[cfg(not(target_os = "emscripten"))] -pub use self::solc::solc::SolcCompiler; +pub use self::solc::solc_compiler::SolcCompiler; #[cfg(target_os = "emscripten")] -pub use self::solc::soljson::SoljsonCompiler; +pub use self::solc::soljson_compiler::SoljsonCompiler; pub use self::solc::standard_json::input::language::Language as SolcStandardJsonInputLanguage; pub use self::solc::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata; pub use self::solc::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer; diff --git a/crates/solidity/src/solc/mod.rs b/crates/solidity/src/solc/mod.rs index c2ca32d..e92d226 100644 --- a/crates/solidity/src/solc/mod.rs +++ b/crates/solidity/src/solc/mod.rs @@ -3,9 +3,9 @@ pub mod combined_json; pub mod pipeline; #[cfg(not(target_os = "emscripten"))] -pub mod solc; +pub mod solc_compiler; #[cfg(target_os = "emscripten")] -pub mod soljson; +pub mod soljson_compiler; pub mod standard_json; pub mod version; diff --git a/crates/solidity/src/solc/solc.rs b/crates/solidity/src/solc/solc_compiler.rs similarity index 100% rename from crates/solidity/src/solc/solc.rs rename to crates/solidity/src/solc/solc_compiler.rs diff --git a/crates/solidity/src/solc/soljson.rs b/crates/solidity/src/solc/soljson_compiler.rs similarity index 100% rename from crates/solidity/src/solc/soljson.rs rename to crates/solidity/src/solc/soljson_compiler.rs diff --git a/crates/solidity/src/test_utils.rs b/crates/solidity/src/test_utils.rs index 1a1ea0f..9ffa25a 100644 --- a/crates/solidity/src/test_utils.rs +++ b/crates/solidity/src/test_utils.rs @@ -9,7 +9,7 @@ use once_cell::sync::Lazy; use crate::project::Project; use crate::solc::pipeline::Pipeline as SolcPipeline; -use crate::solc::solc::SolcCompiler; +use crate::solc::solc_compiler::SolcCompiler; use crate::solc::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer; use crate::solc::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection; use crate::solc::standard_json::input::Input as SolcStandardJsonInput; diff --git a/crates/solidity/src/tests/factory_dependency.rs b/crates/solidity/src/tests/factory_dependency.rs index 690e944..2cae2c0 100644 --- a/crates/solidity/src/tests/factory_dependency.rs +++ b/crates/solidity/src/tests/factory_dependency.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; pub const MAIN_CODE: &str = r#" // SPDX-License-Identifier: MIT diff --git a/crates/solidity/src/tests/ir_artifacts.rs b/crates/solidity/src/tests/ir_artifacts.rs index dbc2915..7e01cd5 100644 --- a/crates/solidity/src/tests/ir_artifacts.rs +++ b/crates/solidity/src/tests/ir_artifacts.rs @@ -5,7 +5,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; #[test] fn yul() { diff --git a/crates/solidity/src/tests/libraries.rs b/crates/solidity/src/tests/libraries.rs index 505d3d8..75b573f 100644 --- a/crates/solidity/src/tests/libraries.rs +++ b/crates/solidity/src/tests/libraries.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; pub const LIBRARY_TEST_SOURCE: &str = r#" // SPDX-License-Identifier: MIT diff --git a/crates/solidity/src/tests/messages.rs b/crates/solidity/src/tests/messages.rs index bcb9702..bcadcf1 100644 --- a/crates/solidity/src/tests/messages.rs +++ b/crates/solidity/src/tests/messages.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; use crate::warning::Warning; pub const ECRECOVER_TEST_SOURCE: &str = r#" diff --git a/crates/solidity/src/tests/optimizer.rs b/crates/solidity/src/tests/optimizer.rs index d8a3333..78abb4b 100644 --- a/crates/solidity/src/tests/optimizer.rs +++ b/crates/solidity/src/tests/optimizer.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; pub const SOURCE_CODE: &str = r#" // SPDX-License-Identifier: MIT diff --git a/crates/solidity/src/tests/remappings.rs b/crates/solidity/src/tests/remappings.rs index af0d51a..b34d76c 100644 --- a/crates/solidity/src/tests/remappings.rs +++ b/crates/solidity/src/tests/remappings.rs @@ -5,7 +5,7 @@ use std::collections::BTreeMap; use std::collections::BTreeSet; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; pub const CALLEE_TEST_SOURCE: &str = r#" // SPDX-License-Identifier: MIT diff --git a/crates/solidity/src/tests/runtime_code.rs b/crates/solidity/src/tests/runtime_code.rs index 99fa67e..65dfe0e 100644 --- a/crates/solidity/src/tests/runtime_code.rs +++ b/crates/solidity/src/tests/runtime_code.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; #[test] #[should_panic(expected = "runtimeCode is not supported")] diff --git a/crates/solidity/src/tests/unsupported_opcodes.rs b/crates/solidity/src/tests/unsupported_opcodes.rs index 7c8bb00..ec72436 100644 --- a/crates/solidity/src/tests/unsupported_opcodes.rs +++ b/crates/solidity/src/tests/unsupported_opcodes.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use crate::compiler::pipeline::Pipeline as SolcPipeline; +use crate::solc::pipeline::Pipeline as SolcPipeline; #[test] #[should_panic(expected = "The `CODECOPY` instruction is not supported")]