This commit is contained in:
James Wilson
2025-08-14 10:59:58 +01:00
parent 1c335e5709
commit 30a656844f
9 changed files with 17 additions and 20 deletions
+2 -2
View File
@@ -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::*;
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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);
pub const VERSION_SUPPORTING_VIA_IR: Version = Version::new(0, 8, 13);
+4 -2
View File
@@ -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<CompilerOutput> {
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 {
+1 -1
View File
@@ -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::{
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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)
}
}
}
+4 -5
View File
@@ -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 = "//!";
+2 -6
View File
@@ -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
};
Mode, ModeOptimizerSetting, ModePipeline, ParseModeError, ParsedMode,
};