From 94fff322442ff821b84d57ebeb54beff842f09fa Mon Sep 17 00:00:00 2001
From: "Andrew Phillips (aider)" <andrew.phillips2@canada.ca>
Date: Sat, 10 May 2025 09:44:25 -0300
Subject: [PATCH] fix: resolve from_str usage and filter method errors, remove
 unused imports

---
 src/compression.rs  | 15 ++++++++++++---
 src/modes/status.rs |  4 ++--
 src/modes/update.rs |  1 -
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/compression.rs b/src/compression.rs
index 20bf52f..ee9d3b4 100755
--- a/src/compression.rs
+++ b/src/compression.rs
@@ -111,9 +111,18 @@ lazy_static! {
     pub static ref COMPRESSION_PROGRAMS: EnumMap<CompressionType, Option<CompressionEngineProgram>> = enum_map! {
         CompressionType::LZ4 => None,
         CompressionType::GZip => None,
-        CompressionType::BZip2 => CompressionEngineProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"]).filter(|p| p.supported),
-        CompressionType::XZ => CompressionEngineProgram::new("xz", vec!["-qcf"], vec!["-dcf"]).filter(|p| p.supported),
-        CompressionType::ZStd => CompressionEngineProgram::new("zstd", vec!["-qcf"], vec!["-dcf"]).filter(|p| p.supported),
+        CompressionType::BZip2 => {
+            let program = CompressionEngineProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"]);
+            if program.supported { Some(program) } else { None }
+        },
+        CompressionType::XZ => {
+            let program = CompressionEngineProgram::new("xz", vec!["-qcf"], vec!["-dcf"]);
+            if program.supported { Some(program) } else { None }
+        },
+        CompressionType::ZStd => {
+            let program = CompressionEngineProgram::new("zstd", vec!["-qcf"], vec!["-dcf"]);
+            if program.supported { Some(program) } else { None }
+        },
         CompressionType::None => None
     };
 }
diff --git a/src/modes/status.rs b/src/modes/status.rs
index 3e96334..6155d0f 100644
--- a/src/modes/status.rs
+++ b/src/modes/status.rs
@@ -1,6 +1,6 @@
 use std::io;
 use std::path::PathBuf;
-use anyhow::{Context, Result, Error, anyhow};
+use anyhow::{Context, Result, anyhow};
 use rusqlite::Connection;
 use gethostname::gethostname;
 use strum::IntoEnumIterator;
@@ -74,7 +74,7 @@ pub fn mode_status(_cmd: &mut Command, args: crate::Args, data_path: PathBuf, db
 
 
     let default_type = match args.item.compression {
-        Some(compression_name) => CompressionType::from_str(&compression_name)
+        Some(compression_name) => FromStr::from_str(&compression_name)
             .context(anyhow!("Invalid compression type {}", compression_name))?,
         None => default_type()
     };
diff --git a/src/modes/update.rs b/src/modes/update.rs
index 04402ea..4ae1332 100644
--- a/src/modes/update.rs
+++ b/src/modes/update.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use std::path::PathBuf;
-use std::str::FromStr;
 
 use crate::db;
 use clap::Command;