Merge branch 'master' into Pr0methean-patch-1

This commit is contained in:
Chris Hennick 2023-04-25 16:35:08 -07:00 committed by GitHub
commit e4d98c9e9a
Signed by: DevComp
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,10 +1,7 @@
//! Types for creating ZIP archives
use crate::compression::CompressionMethod;
use crate::read::{
central_header_to_zip_file, find_content, make_crypto_reader, make_reader, ZipArchive, ZipFile,
ZipFileReader,
};
use crate::read::{central_header_to_zip_file, find_content, ZipArchive, ZipFile, ZipFileReader};
use crate::result::{ZipError, ZipResult};
use crate::spec;
use crate::types::{AtomicU64, DateTime, System, ZipFileData, DEFAULT_VERSION};
@ -911,7 +908,7 @@ impl<W: Write + Seek> Drop for ZipWriter<W> {
fn drop(&mut self) {
if !self.inner.is_closed() {
if let Err(e) = self.finalize() {
let _ = write!(io::stderr(), "ZipWriter drop failed: {e:?}");
let _ = write!(io::stderr(), "ZipWriter drop failed: {:?}", e);
}
}
}