From 84aa6e8f11805378b6f0fabc820a8b3ad9519e34 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 5 May 2024 18:55:48 -0700 Subject: [PATCH] refactor: Make `ZipWriter::finish()` consume the `ZipWriter` --- src/write.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/write.rs b/src/write.rs index 0760365b..4a26d9a4 100644 --- a/src/write.rs +++ b/src/write.rs @@ -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. /// 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 inner = mem::replace(&mut self.inner, Closed); Ok(inner.unwrap()) @@ -1440,14 +1440,13 @@ impl<W: Write + Seek> GenericZipWriter<W> { feature = "deflate-zlib-ng", ))] { - return Ok(Box::new(move |bare| { + Ok(Box::new(move |bare| { GenericZipWriter::Deflater(DeflateEncoder::new( bare, Compression::new(level), )) - })); + })) } - unreachable!() } #[cfg(feature = "deflate64")] CompressionMethod::Deflate64 => Err(ZipError::UnsupportedArchive(