From 7e63526abc133de63b216da1ceaee0901b7d8bab Mon Sep 17 00:00:00 2001 From: Mathias Zhang Date: Thu, 3 Jul 2025 20:35:32 +0800 Subject: [PATCH] style: cargo fmt --- src/commands/compress.rs | 16 ++++++++++------ src/commands/decompress.rs | 5 +++-- src/extension.rs | 2 +- src/utils/fs.rs | 5 +---- tests/mime.rs | 3 +-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/commands/compress.rs b/src/commands/compress.rs index 9e5fd65..0e6233b 100644 --- a/src/commands/compress.rs +++ b/src/commands/compress.rs @@ -68,16 +68,20 @@ pub fn compress_files( ) } Lz4 => Box::new(lz4_flex::frame::FrameEncoder::new(encoder).auto_finish()), - Lzma => return Err(crate::Error::UnsupportedFormat { - reason: "LZMA1 compression is not supported in ouch, use .xz instead.".to_string(), - }), + Lzma => { + return Err(crate::Error::UnsupportedFormat { + reason: "LZMA1 compression is not supported in ouch, use .xz instead.".to_string(), + }) + } Xz => Box::new(liblzma::write::XzEncoder::new( encoder, level.map_or(6, |l| (l as u32).clamp(0, 9)), )), - Lzip => return Err(crate::Error::UnsupportedFormat { - reason: "Lzip compression is not supported in ouch.".to_string(), - }), + Lzip => { + return Err(crate::Error::UnsupportedFormat { + reason: "Lzip compression is not supported in ouch.".to_string(), + }) + } Snappy => Box::new( gzp::par::compress::ParCompress::::builder() .compression_level(gzp::par::compress::Compression::new( diff --git a/src/commands/decompress.rs b/src/commands/decompress.rs index 08d7e95..814980b 100644 --- a/src/commands/decompress.rs +++ b/src/commands/decompress.rs @@ -128,8 +128,9 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> { Box::new(bzip3::read::Bz3Decoder::new(decoder)?) } Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)), - Lzma => Box::new(liblzma::read::XzDecoder::new_stream(decoder, - liblzma::stream::Stream::new_lzma_decoder(u64::MAX).unwrap() + Lzma => Box::new(liblzma::read::XzDecoder::new_stream( + decoder, + liblzma::stream::Stream::new_lzma_decoder(u64::MAX).unwrap(), )), Xz => Box::new(liblzma::read::XzDecoder::new(decoder)), Lzip => Box::new(liblzma::read::XzDecoder::new_stream( diff --git a/src/extension.rs b/src/extension.rs index 9d4bda6..7f5bdef 100644 --- a/src/extension.rs +++ b/src/extension.rs @@ -86,7 +86,7 @@ pub enum CompressionFormat { Bzip3, /// .lz4 Lz4, - /// .xz + /// .xz Xz, /// .lzma Lzma, diff --git a/src/utils/fs.rs b/src/utils/fs.rs index b12866e..8b51a5d 100644 --- a/src/utils/fs.rs +++ b/src/utils/fs.rs @@ -136,10 +136,7 @@ pub fn try_infer_extension(path: &Path) -> Option { buf.starts_with(b"BZ3v1") } fn is_lzma(buf: &[u8]) -> bool { - buf.len() >= 14 - && buf[0] == 0x5d - && (buf[12] == 0x00 || buf[12] == 0xff) - && buf[13] == 0x00 + buf.len() >= 14 && buf[0] == 0x5d && (buf[12] == 0x00 || buf[12] == 0xff) && buf[13] == 0x00 } fn is_xz(buf: &[u8]) -> bool { buf.starts_with(&[0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00]) diff --git a/tests/mime.rs b/tests/mime.rs index 753a524..a09b131 100644 --- a/tests/mime.rs +++ b/tests/mime.rs @@ -17,8 +17,7 @@ fn sanity_check_through_mime() { write_random_content(test_file, &mut SmallRng::from_entropy()); let formats = [ - "7z", "tar", "zip", "tar.gz", "tgz", "tbz", "tbz2", "txz", "tzst", "tar.bz", "tar.bz2", - "tar.xz", "tar.zst", + "7z", "tar", "zip", "tar.gz", "tgz", "tbz", "tbz2", "txz", "tzst", "tar.bz", "tar.bz2", "tar.xz", "tar.zst", ]; let expected_mimes = [