DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix formatting and a Clippy issue

Browse source
This commit is contained in:
Chris Hennick 2023-05-01 10:13:53 -07:00
parent 43a9db8886
commit ae6d98dec2
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
2 changed files with 46 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/types.rs
View file

@ -176,7 +176,15 @@ impl DateTime {
/// Indicates whether this date and time can be written to a zip archive. /// Indicates whether this date and time can be written to a zip archive.
pub fn is_valid(&self) -> bool { pub fn is_valid(&self) -> bool {
DateTime::from_date_and_time(self.year, self.month, self.day, self.hour, self.minute, self.second).is_ok() DateTime::from_date_and_time(
self.year,
self.month,
self.day,
self.hour,
self.minute,
self.second,
)
.is_ok()
} }
#[cfg(feature = "time")] #[cfg(feature = "time")]

72
src/write.rs
View file

@ -90,8 +90,8 @@ pub(crate) mod zip_writer {
pub(super) comment: Vec<u8>, pub(super) comment: Vec<u8>,
} }
} }
pub use zip_writer::ZipWriter;
use crate::write::GenericZipWriter::{Closed, Storer}; use crate::write::GenericZipWriter::{Closed, Storer};
pub use zip_writer::ZipWriter;
#[derive(Default)] #[derive(Default)]
struct ZipWriterStats { struct ZipWriterStats {
@ -959,15 +959,10 @@ impl<W: Write + Seek> GenericZipWriter<W> {
_ => {} _ => {}
} }
match self { if let Closed = self {
Closed => { return Err(
return Err(io::Error::new( io::Error::new(io::ErrorKind::BrokenPipe, "ZipWriter was already closed").into(),
io::ErrorKind::BrokenPipe, );
"ZipWriter was already closed",
)
.into())
}
_ => {}
} }
let make_new_self: Box<dyn FnOnce(W) -> GenericZipWriter<W>> = { let make_new_self: Box<dyn FnOnce(W) -> GenericZipWriter<W>> = {
@ -990,27 +985,34 @@ impl<W: Write + Seek> GenericZipWriter<W> {
CompressionMethod::Deflated => { CompressionMethod::Deflated => {
let level = clamp_opt( let level = clamp_opt(
compression_level.unwrap_or(flate2::Compression::default().level() as i32), compression_level.unwrap_or(flate2::Compression::default().level() as i32),
deflate_compression_level_range() deflate_compression_level_range(),
).ok_or(ZipError::UnsupportedArchive( )
.ok_or(ZipError::UnsupportedArchive(
"Unsupported compression level", "Unsupported compression level",
))? as u32; ))? as u32;
Box::new(move |bare| Box::new(move |bare| {
GenericZipWriter::Deflater(DeflateEncoder::new(bare, flate2::Compression::new(level))) GenericZipWriter::Deflater(DeflateEncoder::new(
) bare,
flate2::Compression::new(level),
))
})
} }
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
CompressionMethod::Bzip2 => { CompressionMethod::Bzip2 => {
let level = clamp_opt( let level = clamp_opt(
compression_level compression_level.unwrap_or(bzip2::Compression::default().level() as i32),
.unwrap_or(bzip2::Compression::default().level() as i32), bzip2_compression_level_range(),
bzip2_compression_level_range(),
).ok_or(ZipError::UnsupportedArchive(
"Unsupported compression level",
))? as u32;
Box::new(move |bare|
GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::new(level)))
) )
}, .ok_or(ZipError::UnsupportedArchive(
"Unsupported compression level",
))? as u32;
Box::new(move |bare| {
GenericZipWriter::Bzip2(BzEncoder::new(
bare,
bzip2::Compression::new(level),
))
})
}
CompressionMethod::AES => { CompressionMethod::AES => {
return Err(ZipError::UnsupportedArchive( return Err(ZipError::UnsupportedArchive(
"AES compression is not supported for writing", "AES compression is not supported for writing",
@ -1022,13 +1024,13 @@ impl<W: Write + Seek> GenericZipWriter<W> {
compression_level.unwrap_or(zstd::DEFAULT_COMPRESSION_LEVEL), compression_level.unwrap_or(zstd::DEFAULT_COMPRESSION_LEVEL),
zstd::compression_level_range(), zstd::compression_level_range(),
) )
.ok_or(ZipError::UnsupportedArchive( .ok_or(ZipError::UnsupportedArchive(
"Unsupported compression level", "Unsupported compression level",
))?; ))?;
Box::new(move |bare| Box::new(move |bare| {
GenericZipWriter::Zstd(ZstdEncoder::new(bare, level).unwrap() GenericZipWriter::Zstd(ZstdEncoder::new(bare, level).unwrap())
)) })
}, }
CompressionMethod::Unsupported(..) => { CompressionMethod::Unsupported(..) => {
return Err(ZipError::UnsupportedArchive("Unsupported compression")) return Err(ZipError::UnsupportedArchive("Unsupported compression"))
} }
@ -1038,9 +1040,9 @@ impl<W: Write + Seek> GenericZipWriter<W> {
let bare = match mem::replace(self, Closed) { let bare = match mem::replace(self, Closed) {
Storer(w) => w, Storer(w) => w,
#[cfg(any( #[cfg(any(
feature = "deflate", feature = "deflate",
feature = "deflate-miniz", feature = "deflate-miniz",
feature = "deflate-zlib" feature = "deflate-zlib"
))] ))]
GenericZipWriter::Deflater(w) => w.finish()?, GenericZipWriter::Deflater(w) => w.finish()?,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
@ -1052,7 +1054,7 @@ impl<W: Write + Seek> GenericZipWriter<W> {
io::ErrorKind::BrokenPipe, io::ErrorKind::BrokenPipe,
"ZipWriter was already closed", "ZipWriter was already closed",
) )
.into()) .into())
} }
}; };
*self = (make_new_self)(bare); *self = (make_new_self)(bare);