diff --git a/crates/common/src/types/mod.rs b/crates/common/src/types/mod.rs index cf2f50a..0e1c34f 100644 --- a/crates/common/src/types/mod.rs +++ b/crates/common/src/types/mod.rs @@ -1,5 +1,5 @@ -mod version_or_requirement; mod mode; +mod version_or_requirement; +pub use mode::*; pub use version_or_requirement::*; -pub use mode::*; \ No newline at end of file diff --git a/crates/common/src/types/mode.rs b/crates/common/src/types/mode.rs index 8e2f5f2..7bf6dc9 100644 --- a/crates/common/src/types/mode.rs +++ b/crates/common/src/types/mode.rs @@ -1,5 +1,5 @@ -use regex::Regex; use crate::types::VersionOrRequirement; +use regex::Regex; use semver::Version; use serde::{Deserialize, Serialize}; use std::collections::HashSet; diff --git a/crates/compiler/src/constants.rs b/crates/compiler/src/constants.rs index 0abd722..80840dd 100644 --- a/crates/compiler/src/constants.rs +++ b/crates/compiler/src/constants.rs @@ -1,4 +1,4 @@ use semver::Version; /// This is the first version of solc that supports the `--via-ir` flag / "viaIR" input JSON. -pub const VERSION_SUPPORTING_VIA_IR: Version = Version::new(0, 8, 13); \ No newline at end of file +pub const VERSION_SUPPORTING_VIA_IR: Version = Version::new(0, 8, 13); diff --git a/crates/compiler/src/revive_resolc.rs b/crates/compiler/src/revive_resolc.rs index d542e40..245c75c 100644 --- a/crates/compiler/src/revive_resolc.rs +++ b/crates/compiler/src/revive_resolc.rs @@ -14,8 +14,8 @@ use revive_solc_json_interface::{ SolcStandardJsonOutput, }; -use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler}; use super::constants::VERSION_SUPPORTING_VIA_IR; +use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler}; use alloy::json_abi::JsonAbi; use anyhow::Context; @@ -54,7 +54,9 @@ impl SolidityCompiler for Resolc { additional_options: Self::Options, ) -> anyhow::Result { if !matches!(pipeline, None | Some(ModePipeline::Y)) { - anyhow::bail!("Resolc only supports the Y (via Yul IR) pipeline, but the provided pipeline is {pipeline:?}"); + anyhow::bail!( + "Resolc only supports the Y (via Yul IR) pipeline, but the provided pipeline is {pipeline:?}" + ); } let input = SolcStandardJsonInput { diff --git a/crates/compiler/src/solc.rs b/crates/compiler/src/solc.rs index c8df146..c5f5098 100644 --- a/crates/compiler/src/solc.rs +++ b/crates/compiler/src/solc.rs @@ -10,8 +10,8 @@ use revive_dt_common::types::VersionOrRequirement; use revive_dt_config::Arguments; use revive_dt_solc_binaries::download_solc; -use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler}; use super::constants::VERSION_SUPPORTING_VIA_IR; +use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler}; use anyhow::Context; use foundry_compilers_artifacts::{ diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index 5ad9a50..ab90e76 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -22,10 +22,10 @@ use tokio::sync::{Mutex, RwLock, mpsc}; use tracing::{Instrument, Level}; use tracing_subscriber::{EnvFilter, FmtSubscriber}; +use revive_dt_common::types::Mode; use revive_dt_compiler::SolidityCompiler; use revive_dt_compiler::{Compiler, CompilerOutput}; use revive_dt_config::*; -use revive_dt_common::types::Mode; use revive_dt_core::{ Geth, Kitchensink, Platform, driver::{CaseDriver, CaseState}, diff --git a/crates/format/src/case.rs b/crates/format/src/case.rs index 77c5d46..b1bd234 100644 --- a/crates/format/src/case.rs +++ b/crates/format/src/case.rs @@ -72,4 +72,4 @@ impl std::fmt::Display for CaseIdx { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.0) } -} \ No newline at end of file +} diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index be1a78b..c9b43fc 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -11,13 +11,12 @@ use std::{ use serde::{Deserialize, Serialize}; use revive_common::EVMVersion; -use revive_dt_common::{iterators::FilesWithExtensionIterator, macros::define_wrapper_type, types::Mode}; - -use crate::{ - case::Case, - mode::ParsedMode, +use revive_dt_common::{ + iterators::FilesWithExtensionIterator, macros::define_wrapper_type, types::Mode, }; +use crate::{case::Case, mode::ParsedMode}; + pub const METADATA_FILE_EXTENSION: &str = "json"; pub const SOLIDITY_CASE_FILE_EXTENSION: &str = "sol"; pub const SOLIDITY_CASE_COMMENT_MARKER: &str = "//!"; diff --git a/crates/format/src/mode.rs b/crates/format/src/mode.rs index 2812bfd..3f0d1be 100644 --- a/crates/format/src/mode.rs +++ b/crates/format/src/mode.rs @@ -1,8 +1,4 @@ // Re-export the "format" side of our mode types from the common crate. pub use revive_dt_common::types::{ - Mode, - ModeOptimizerSetting, - ModePipeline, - ParsedMode, - ParseModeError -}; \ No newline at end of file + Mode, ModeOptimizerSetting, ModePipeline, ParseModeError, ParsedMode, +};