From fdcccc844eb8c355f32574141592c1f3f6bc9fbc Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Wed, 27 Aug 2025 13:59:37 -0300 Subject: [PATCH] refactor: remove new_simple methods and replace with new(None, None) Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) --- src/meta_plugin/binary.rs | 3 --- src/meta_plugin/cwd.rs | 3 --- src/meta_plugin/digest.rs | 3 --- src/meta_plugin/hostname.rs | 3 --- src/meta_plugin/keep_pid.rs | 3 --- src/meta_plugin/magic.rs | 3 --- src/meta_plugin/mod.rs | 37 ++++++++++++++++++------------------ src/meta_plugin/program.rs | 3 --- src/meta_plugin/read_rate.rs | 3 --- src/meta_plugin/read_time.rs | 3 --- src/meta_plugin/shell.rs | 3 --- src/meta_plugin/shell_pid.rs | 3 --- src/meta_plugin/text.rs | 3 --- src/meta_plugin/user.rs | 3 --- 14 files changed, 18 insertions(+), 58 deletions(-) diff --git a/src/meta_plugin/binary.rs b/src/meta_plugin/binary.rs index 1666455..f716e94 100644 --- a/src/meta_plugin/binary.rs +++ b/src/meta_plugin/binary.rs @@ -37,9 +37,6 @@ impl BinaryMetaPlugin { } } - pub fn new_simple() -> BinaryMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for BinaryMetaPlugin { diff --git a/src/meta_plugin/cwd.rs b/src/meta_plugin/cwd.rs index 12e65f3..226832d 100644 --- a/src/meta_plugin/cwd.rs +++ b/src/meta_plugin/cwd.rs @@ -40,9 +40,6 @@ impl CwdMetaPlugin { } } - pub fn new_simple() -> CwdMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for CwdMetaPlugin { diff --git a/src/meta_plugin/digest.rs b/src/meta_plugin/digest.rs index 5ada6ab..19c1bcd 100644 --- a/src/meta_plugin/digest.rs +++ b/src/meta_plugin/digest.rs @@ -131,9 +131,6 @@ impl DigestMetaPlugin { plugin } - pub fn new_simple() -> DigestMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for DigestMetaPlugin { diff --git a/src/meta_plugin/hostname.rs b/src/meta_plugin/hostname.rs index 827a7cf..d0e9548 100644 --- a/src/meta_plugin/hostname.rs +++ b/src/meta_plugin/hostname.rs @@ -43,9 +43,6 @@ impl HostnameMetaPlugin { } } - pub fn new_simple() -> HostnameMetaPlugin { - Self::new(None, None) - } fn get_hostname(&self) -> String { // First get the short hostname diff --git a/src/meta_plugin/keep_pid.rs b/src/meta_plugin/keep_pid.rs index e5f2e26..6accc94 100644 --- a/src/meta_plugin/keep_pid.rs +++ b/src/meta_plugin/keep_pid.rs @@ -42,9 +42,6 @@ impl KeepPidMetaPlugin { } } - pub fn new_simple() -> KeepPidMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for KeepPidMetaPlugin { diff --git a/src/meta_plugin/magic.rs b/src/meta_plugin/magic.rs index f86fb3b..dd66f92 100644 --- a/src/meta_plugin/magic.rs +++ b/src/meta_plugin/magic.rs @@ -57,9 +57,6 @@ impl MagicFileMetaPlugin { } } - pub fn new_simple() -> MagicFileMetaPlugin { - Self::new(None, None) - } fn get_magic_result(&self, flags: CookieFlags) -> io::Result { // Use the existing cookie and just change flags diff --git a/src/meta_plugin/mod.rs b/src/meta_plugin/mod.rs index 81ef033..4c12834 100644 --- a/src/meta_plugin/mod.rs +++ b/src/meta_plugin/mod.rs @@ -256,26 +256,25 @@ pub trait MetaPlugin where Self: 'static { } pub fn get_meta_plugin(meta_plugin_type: MetaPluginType) -> Box { - // For now, use new_simple() which passes None for options and outputs - // The calling code should be updated to use a different function that accepts options and outputs + // Use new(None, None) which passes None for options and outputs match meta_plugin_type { - MetaPluginType::FileMagic => Box::new(MetaPluginProgram::new_simple("file", vec!["-bE", "-"], "file_magic".to_string(), true)), - MetaPluginType::FileMime => Box::new(MetaPluginProgram::new_simple("file", vec!["-b", "--mime-type", "-"], "file_mime".to_string(), true)), - MetaPluginType::FileEncoding => Box::new(MetaPluginProgram::new_simple("file", vec!["-b", "--mime-encoding", "-"], "file_encoding".to_string(), true)), - MetaPluginType::MagicFile => Box::new(MagicFileMetaPlugin::new_simple()), - MetaPluginType::LineCount => Box::new(MetaPluginProgram::new_simple("wc", vec!["-l"], "line_count".to_string(), true)), - MetaPluginType::WordCount => Box::new(MetaPluginProgram::new_simple("wc", vec!["-w"], "word_count".to_string(), true)), - MetaPluginType::Cwd => Box::new(CwdMetaPlugin::new_simple()), - MetaPluginType::Binary => Box::new(BinaryMetaPlugin::new_simple()), - MetaPluginType::Text => Box::new(TextMetaPlugin::new_simple()), - MetaPluginType::User => Box::new(UserMetaPlugin::new_simple()), - MetaPluginType::Shell => Box::new(ShellMetaPlugin::new_simple()), - MetaPluginType::ShellPid => Box::new(ShellPidMetaPlugin::new_simple()), - MetaPluginType::KeepPid => Box::new(KeepPidMetaPlugin::new_simple()), - MetaPluginType::Digest => Box::new(DigestMetaPlugin::new_simple()), - MetaPluginType::ReadTime => Box::new(ReadTimeMetaPlugin::new_simple()), - MetaPluginType::ReadRate => Box::new(ReadRateMetaPlugin::new_simple()), - MetaPluginType::Hostname => Box::new(HostnameMetaPlugin::new_simple()), + MetaPluginType::FileMagic => Box::new(MetaPluginProgram::new("file", vec!["-bE", "-"], "file_magic".to_string(), true, None, None)), + MetaPluginType::FileMime => Box::new(MetaPluginProgram::new("file", vec!["-b", "--mime-type", "-"], "file_mime".to_string(), true, None, None)), + MetaPluginType::FileEncoding => Box::new(MetaPluginProgram::new("file", vec!["-b", "--mime-encoding", "-"], "file_encoding".to_string(), true, None, None)), + MetaPluginType::MagicFile => Box::new(MagicFileMetaPlugin::new(None, None)), + MetaPluginType::LineCount => Box::new(MetaPluginProgram::new("wc", vec!["-l"], "line_count".to_string(), true, None, None)), + MetaPluginType::WordCount => Box::new(MetaPluginProgram::new("wc", vec!["-w"], "word_count".to_string(), true, None, None)), + MetaPluginType::Cwd => Box::new(CwdMetaPlugin::new(None, None)), + MetaPluginType::Binary => Box::new(BinaryMetaPlugin::new(None, None)), + MetaPluginType::Text => Box::new(TextMetaPlugin::new(None, None)), + MetaPluginType::User => Box::new(UserMetaPlugin::new(None, None)), + MetaPluginType::Shell => Box::new(ShellMetaPlugin::new(None, None)), + MetaPluginType::ShellPid => Box::new(ShellPidMetaPlugin::new(None, None)), + MetaPluginType::KeepPid => Box::new(KeepPidMetaPlugin::new(None, None)), + MetaPluginType::Digest => Box::new(DigestMetaPlugin::new(None, None)), + MetaPluginType::ReadTime => Box::new(ReadTimeMetaPlugin::new(None, None)), + MetaPluginType::ReadRate => Box::new(ReadRateMetaPlugin::new(None, None)), + MetaPluginType::Hostname => Box::new(HostnameMetaPlugin::new(None, None)), } } diff --git a/src/meta_plugin/program.rs b/src/meta_plugin/program.rs index 91c6249..67f9b51 100644 --- a/src/meta_plugin/program.rs +++ b/src/meta_plugin/program.rs @@ -77,9 +77,6 @@ impl MetaPluginProgram { } } - pub fn new_simple(program: &str, args: Vec<&str>, meta_name: String, split_whitespace: bool) -> MetaPluginProgram { - Self::new(program, args, meta_name, split_whitespace, None, None) - } } impl MetaPlugin for MetaPluginProgram { diff --git a/src/meta_plugin/read_rate.rs b/src/meta_plugin/read_rate.rs index 4b8fc97..edcb067 100644 --- a/src/meta_plugin/read_rate.rs +++ b/src/meta_plugin/read_rate.rs @@ -47,9 +47,6 @@ impl ReadRateMetaPlugin { } } - pub fn new_simple() -> ReadRateMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for ReadRateMetaPlugin { diff --git a/src/meta_plugin/read_time.rs b/src/meta_plugin/read_time.rs index a79fb46..4324283 100644 --- a/src/meta_plugin/read_time.rs +++ b/src/meta_plugin/read_time.rs @@ -45,9 +45,6 @@ impl ReadTimeMetaPlugin { } } - pub fn new_simple() -> ReadTimeMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for ReadTimeMetaPlugin { diff --git a/src/meta_plugin/shell.rs b/src/meta_plugin/shell.rs index 1f65df3..4ddba7d 100644 --- a/src/meta_plugin/shell.rs +++ b/src/meta_plugin/shell.rs @@ -42,9 +42,6 @@ impl ShellMetaPlugin { } } - pub fn new_simple() -> ShellMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for ShellMetaPlugin { diff --git a/src/meta_plugin/shell_pid.rs b/src/meta_plugin/shell_pid.rs index 4ca7aee..ff0c3bf 100644 --- a/src/meta_plugin/shell_pid.rs +++ b/src/meta_plugin/shell_pid.rs @@ -43,9 +43,6 @@ impl ShellPidMetaPlugin { } } - pub fn new_simple() -> ShellPidMetaPlugin { - Self::new(None, None) - } } impl MetaPlugin for ShellPidMetaPlugin { diff --git a/src/meta_plugin/text.rs b/src/meta_plugin/text.rs index da30b47..8bbf9fb 100644 --- a/src/meta_plugin/text.rs +++ b/src/meta_plugin/text.rs @@ -101,9 +101,6 @@ impl TextMetaPlugin { } } - pub fn new_simple() -> TextMetaPlugin { - Self::new(None, None) - } /// Count words and lines in a text chunk, handling block boundaries correctly fn count_text_stats(&mut self, data: &[u8]) { diff --git a/src/meta_plugin/user.rs b/src/meta_plugin/user.rs index e6477f6..f2e9f59 100644 --- a/src/meta_plugin/user.rs +++ b/src/meta_plugin/user.rs @@ -25,9 +25,6 @@ impl UserMetaPlugin { } } - pub fn new_simple() -> UserMetaPlugin { - Self::new(None, None) - } fn get_current_username() -> Option { uzers::get_user_by_uid(uzers::get_current_uid())