fix: resolve type mismatches and missing args module

Co-authored-by: aider (openai/andrew/openrouter/sonoma-sky-alpha) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-09-11 11:58:47 -03:00
parent 4b67ff5763
commit f2951bf78e
2 changed files with 9 additions and 8 deletions

View File

@@ -176,33 +176,33 @@ impl Clone for Box<dyn CompressionEngine> {
lazy_static! { lazy_static! {
static ref COMPRESSION_ENGINES: EnumMap<CompressionType, Box<dyn CompressionEngine>> = { static ref COMPRESSION_ENGINES: EnumMap<CompressionType, Box<dyn CompressionEngine>> = {
let mut em = enum_map! { let mut em = enum_map! {
CompressionType::LZ4 => Box::new(crate::compression_engine::lz4::CompressionEngineLZ4::new()), CompressionType::LZ4 => Box::new(crate::compression_engine::lz4::CompressionEngineLZ4::new()) as Box<dyn CompressionEngine>,
CompressionType::GZip => Box::new(crate::compression_engine::program::CompressionEngineProgram::new( CompressionType::GZip => Box::new(crate::compression_engine::program::CompressionEngineProgram::new(
"gzip", "gzip",
vec!["-c"], vec!["-c"],
vec!["-d", "-c"] vec!["-d", "-c"]
)), )) as Box<dyn CompressionEngine>,
CompressionType::BZip2 => Box::new(crate::compression_engine::program::CompressionEngineProgram::new( CompressionType::BZip2 => Box::new(crate::compression_engine::program::CompressionEngineProgram::new(
"bzip2", "bzip2",
vec!["-c"], vec!["-c"],
vec!["-d", "-c"] vec!["-d", "-c"]
)), )) as Box<dyn CompressionEngine>,
CompressionType::XZ => Box::new(crate::compression_engine::program::CompressionEngineProgram::new( CompressionType::XZ => Box::new(crate::compression_engine::program::CompressionEngineProgram::new(
"xz", "xz",
vec!["-c"], vec!["-c"],
vec!["-d", "-c"] vec!["-d", "-c"]
)), )) as Box<dyn CompressionEngine>,
CompressionType::ZStd => Box::new(crate::compression_engine::program::CompressionEngineProgram::new( CompressionType::ZStd => Box::new(crate::compression_engine::program::CompressionEngineProgram::new(
"zstd", "zstd",
vec!["-c"], vec!["-c"],
vec!["-d", "-c"] vec!["-d", "-c"]
)), )) as Box<dyn CompressionEngine>,
CompressionType::None => Box::new(crate::compression_engine::none::CompressionEngineNone::new()) CompressionType::None => Box::new(crate::compression_engine::none::CompressionEngineNone::new()) as Box<dyn CompressionEngine>
}; };
#[cfg(feature = "gzip")] #[cfg(feature = "gzip")]
{ {
em[CompressionType::GZip] = Box::new(crate::compression_engine::gzip::CompressionEngineGZip::new()); em[CompressionType::GZip] = Box::new(crate::compression_engine::gzip::CompressionEngineGZip::new()) as Box<dyn CompressionEngine>;
} }
em em
@@ -214,7 +214,7 @@ pub fn default_compression_type() -> CompressionType {
} }
pub fn get_compression_engine(ct: CompressionType) -> Result<Box<dyn CompressionEngine>> { pub fn get_compression_engine(ct: CompressionType) -> Result<Box<dyn CompressionEngine>> {
let engine = &COMPRESSION_ENGINES[ct]; let engine = &COMPRESSION_ENGINES[ct.clone()];
if engine.is_supported() { if engine.is_supported() {
Ok(engine.clone()) Ok(engine.clone())
} else { } else {

View File

@@ -37,6 +37,7 @@ pub mod db;
pub mod meta_plugin; pub mod meta_plugin;
pub mod modes; pub mod modes;
pub mod filter_plugin; pub mod filter_plugin;
pub mod args;
// Re-export Args struct for library usage // Re-export Args struct for library usage
pub use args::Args; pub use args::Args;