FIX 9919c72: add doc comment, remove accidentally doubled is_archive()

ouch-org · Nov 1, 2021 · 8527616 · 8527616
1 parent 9919c72
commit 8527616
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/archive/tar.rs b/src/archive/tar.rs
@@ -44,6 +44,8 @@ pub fn unpack_archive(
 
     Ok(files_unpacked)
 }
+
+/// List contents of `archive`, returning a vector of archive entries
 pub fn list_archive(reader: Box<dyn Read>) -> crate::Result<Vec<FileInArchive>> {
     let mut archive = tar::Archive::new(reader);
 

diff --git a/src/commands.rs b/src/commands.rs
@@ -192,7 +192,7 @@ pub fn run(args: Opts, question_policy: QuestionPolicy) -> crate::Result<()> {
             let not_archives: Vec<PathBuf> = files
                 .iter()
                 .zip(&formats)
-                .filter(|(_, formats)| formats.is_empty() || !formats[0].is_archive())
+                .filter(|(_, formats)| formats.is_empty() || !formats[0].is_archive_format())
                 .map(|(path, _)| path.clone())
                 .collect();
 

diff --git a/src/extension.rs b/src/extension.rs
@@ -47,11 +47,6 @@ impl fmt::Display for CompressionFormat {
         )
     }
 }
-impl CompressionFormat {
-    pub fn is_archive(&self) -> bool {
-        matches!(self, Tar | Tgz | Tbz | Tlzma | Tzst | Zip)
-    }
-}
 
 // use crate::extension::CompressionFormat::*;
 //