From a51f5123bf05ab38d3474de13c565048e496f716 Mon Sep 17 00:00:00 2001 From: Arnaud Gourlay Date: Wed, 15 Apr 2026 14:12:39 +0200 Subject: [PATCH 1/2] Upgrade libflate 2.3.0 (was 2.1.0) --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2cf1b19..def90ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ homepage = "https://github.com/SOF3/include-flate" license = "Apache-2.0" [workspace.dependencies] -libflate = "2.1.0" +libflate = "2.3.0" zstd = "0.13.3" [package] From 6ad4b28720ba29d71aad28d07da15454ed67dfd7 Mon Sep 17 00:00:00 2001 From: Arnaud Gourlay Date: Wed, 15 Apr 2026 14:31:46 +0200 Subject: [PATCH 2/2] fix fmt --- compress/src/lib.rs | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/compress/src/lib.rs b/compress/src/lib.rs index 460330a..e6b0a47 100644 --- a/compress/src/lib.rs +++ b/compress/src/lib.rs @@ -66,22 +66,19 @@ pub enum CompressionMethod { } impl CompressionMethod { - pub fn encoder( - &self, - write: W, - ) -> Result, CompressionError> { + pub fn encoder(&self, write: W) -> Result, CompressionError> { FlateEncoder::new(*self, write) } - pub fn decoder( - &self, - read: R, - ) -> Result, CompressionError> { + pub fn decoder(&self, read: R) -> Result, CompressionError> { FlateDecoder::new(*self, read) } } -#[expect(clippy::derivable_impls, reason = "cfg_attr on defaults could be confusing")] +#[expect( + clippy::derivable_impls, + reason = "cfg_attr on defaults could be confusing" +)] #[cfg(any(feature = "deflate", feature = "zstd"))] impl Default for CompressionMethod { fn default() -> Self { @@ -115,10 +112,7 @@ pub enum FlateEncoder { } impl FlateEncoder { - pub fn new( - method: CompressionMethod, - write: W, - ) -> Result, CompressionError> { + pub fn new(method: CompressionMethod, write: W) -> Result, CompressionError> { match method { #[cfg(feature = "deflate")] CompressionMethod::Deflate => Ok(FlateEncoder::Deflate(DeflateEncoder::new(write))), @@ -159,9 +153,7 @@ impl FlateEncoder { .into_result() .map_err(CompressionError::DeflateError), #[cfg(feature = "zstd")] - FlateEncoder::Zstd(encoder) => { - encoder.finish().map_err(CompressionError::ZstdError) - } + FlateEncoder::Zstd(encoder) => encoder.finish().map_err(CompressionError::ZstdError), } } } @@ -174,10 +166,7 @@ pub enum FlateDecoder { } impl FlateDecoder { - pub fn new( - method: CompressionMethod, - read: R, - ) -> Result, CompressionError> { + pub fn new(method: CompressionMethod, read: R) -> Result, CompressionError> { match method { #[cfg(feature = "deflate")] CompressionMethod::Deflate => Ok(FlateDecoder::Deflate(DeflateDecoder::new(read))), @@ -219,8 +208,7 @@ pub fn apply_decompression( reader: impl Read, mut writer: impl Write, method: CompressionMethod, -) -> Result<(), CompressionError> -{ +) -> Result<(), CompressionError> { let mut decoder = method.decoder(reader)?; io::copy(&mut decoder, &mut writer)?; Ok(())