github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 12:05:46 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

minor improvements

Browse Source
This commit is contained in:
figsoda 2021-11-02 17:35:14 -04:00
parent 296826b4d3
commit 27d8e64192
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands.rs
View File

@ -279,7 +279,7 @@ fn compress_files(files: Vec<PathBuf>, formats: Vec<Extension>, output_file: fs:
// is guaranteed to be valid // is guaranteed to be valid
Box::new(zstd_encoder.unwrap().auto_finish()) Box::new(zstd_encoder.unwrap().auto_finish())
} }
_ => unreachable!(), Tar | Zip => unreachable!(),
}; };
encoder encoder
}; };
@ -368,7 +368,7 @@ fn decompress_file(
Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)), Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)),
Lzma => Box::new(xz2::read::XzDecoder::new(decoder)), Lzma => Box::new(xz2::read::XzDecoder::new(decoder)),
Zstd => Box::new(zstd::stream::Decoder::new(decoder)?), Zstd => Box::new(zstd::stream::Decoder::new(decoder)?),
_ => unreachable!(), Tar | Zip => unreachable!(),
}; };
Ok(decoder) Ok(decoder)
}; };
@ -456,7 +456,7 @@ fn list_archive_contents(
Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)), Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)),
Lzma => Box::new(xz2::read::XzDecoder::new(decoder)), Lzma => Box::new(xz2::read::XzDecoder::new(decoder)),
Zstd => Box::new(zstd::stream::Decoder::new(decoder)?), Zstd => Box::new(zstd::stream::Decoder::new(decoder)?),
_ => unreachable!(), Tar | Zip => unreachable!(),
}; };
Ok(decoder) Ok(decoder)
}; };

2
src/extension.rs
View File

@ -150,7 +150,7 @@ mod tests {
use CompressionFormat::*; use CompressionFormat::*;
let path = Path::new("bolovo.tar.gz"); let path = Path::new("bolovo.tar.gz");
let extensions: Vec<Extension> = extensions_from_path(&path); let extensions: Vec<Extension> = extensions_from_path(path);
let formats: Vec<&CompressionFormat> = extensions.iter().flat_map(Extension::iter).collect::<Vec<_>>(); let formats: Vec<&CompressionFormat> = extensions.iter().flat_map(Extension::iter).collect::<Vec<_>>();
assert_eq!(formats, vec![&Tar, &Gzip]); assert_eq!(formats, vec![&Tar, &Gzip]);