Skip to content

Upgrade libflate 2.3.0 (was 2.1.0) #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SOF3 merged 2 commits into from
Apr 15, 2026
Merged

Upgrade libflate 2.3.0 (was 2.1.0) #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51f512
Upgrade libflate 2.3.0 (was 2.1.0)
agourlay Apr 15, 2026
6ad4b28
fix fmt
agourlay Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
32 changes: 10 additions & 22 deletions compress/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,19 @@ pub enum CompressionMethod {
}

impl CompressionMethod {
pub fn encoder<W: Write>(
&self,
write: W,
) -> Result<FlateEncoder<W>, CompressionError> {
pub fn encoder<W: Write>(&self, write: W) -> Result<FlateEncoder<W>, CompressionError> {
FlateEncoder::new(*self, write)
}

pub fn decoder<R: Read>(
&self,
read: R,
) -> Result<FlateDecoder<R>, CompressionError> {
pub fn decoder<R: Read>(&self, read: R) -> Result<FlateDecoder<R>, 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 {
Expand Down Expand Up @@ -115,10 +112,7 @@ pub enum FlateEncoder<W: Write> {
}

impl<W: Write> FlateEncoder<W> {
pub fn new(
method: CompressionMethod,
write: W,
) -> Result<FlateEncoder<W>, CompressionError> {
pub fn new(method: CompressionMethod, write: W) -> Result<FlateEncoder<W>, CompressionError> {
match method {
#[cfg(feature = "deflate")]
CompressionMethod::Deflate => Ok(FlateEncoder::Deflate(DeflateEncoder::new(write))),
Expand Down Expand Up @@ -159,9 +153,7 @@ impl<W: Write> FlateEncoder<W> {
.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),
}
}
}
Expand All @@ -174,10 +166,7 @@ pub enum FlateDecoder<R> {
}

impl<R: Read> FlateDecoder<R> {
pub fn new(
method: CompressionMethod,
read: R,
) -> Result<FlateDecoder<R>, CompressionError> {
pub fn new(method: CompressionMethod, read: R) -> Result<FlateDecoder<R>, CompressionError> {
match method {
#[cfg(feature = "deflate")]
CompressionMethod::Deflate => Ok(FlateDecoder::Deflate(DeflateDecoder::new(read))),
Expand Down Expand Up @@ -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(())
Expand Down
Loading