Upgrade zip crate to v2 (#12196)

Closes #12195.
This commit is contained in:
Charlie Marsh 2025-03-16 16:58:11 -07:00 committed by GitHub
parent 9785266e29
commit 277c15bd66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 57 additions and 11 deletions

View file

@ -644,7 +644,7 @@ impl ZipDirectoryWriter {
) -> Result<Box<dyn Write + 'slf>, Error> {
// 644 is the default of the zip crate.
let permissions = if executable_bit { 775 } else { 664 };
let options = zip::write::FileOptions::default()
let options = zip::write::SimpleFileOptions::default()
.unix_permissions(permissions)
.compression_method(self.compression);
self.writer.start_file(path, options)?;
@ -655,7 +655,7 @@ impl ZipDirectoryWriter {
impl DirectoryWriter for ZipDirectoryWriter {
fn write_bytes(&mut self, path: &str, bytes: &[u8]) -> Result<(), Error> {
trace!("Adding {}", path);
let options = zip::write::FileOptions::default().compression_method(self.compression);
let options = zip::write::SimpleFileOptions::default().compression_method(self.compression);
self.writer.start_file(path, options)?;
self.writer.write_all(bytes)?;
@ -690,7 +690,7 @@ impl DirectoryWriter for ZipDirectoryWriter {
fn write_directory(&mut self, directory: &str) -> Result<(), Error> {
trace!("Adding directory {}", directory);
let options = zip::write::FileOptions::default().compression_method(self.compression);
let options = zip::write::SimpleFileOptions::default().compression_method(self.compression);
Ok(self.writer.add_directory(directory, options)?)
}