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

refactor: Make ZipWriter::finish() consume the ZipWriter

Browse source
This commit is contained in:
Chris Hennick 2024-05-05 18:55:48 -07:00
parent a8ec016b51
commit 84aa6e8f11
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/write.rs
View file

@ -1188,7 +1188,7 @@ impl<W: Write + Seek> ZipWriter<W> {
/// ///
/// This will return the writer, but one should normally not append any data to the end of the file. /// This will return the writer, but one should normally not append any data to the end of the file.
/// Note that the zipfile will also be finished on drop. /// Note that the zipfile will also be finished on drop.
pub fn finish(&mut self) -> ZipResult<W> { pub fn finish(mut self) -> ZipResult<W> {
let _central_start = self.finalize()?; let _central_start = self.finalize()?;
let inner = mem::replace(&mut self.inner, Closed); let inner = mem::replace(&mut self.inner, Closed);
Ok(inner.unwrap()) Ok(inner.unwrap())
@ -1440,14 +1440,13 @@ impl<W: Write + Seek> GenericZipWriter<W> {
feature = "deflate-zlib-ng", feature = "deflate-zlib-ng",
))] ))]
{ {
return Ok(Box::new(move |bare| { Ok(Box::new(move |bare| {
GenericZipWriter::Deflater(DeflateEncoder::new( GenericZipWriter::Deflater(DeflateEncoder::new(
bare, bare,
Compression::new(level), Compression::new(level),
)) ))
})); }))
} }
unreachable!()
} }
#[cfg(feature = "deflate64")] #[cfg(feature = "deflate64")]
CompressionMethod::Deflate64 => Err(ZipError::UnsupportedArchive( CompressionMethod::Deflate64 => Err(ZipError::UnsupportedArchive(