From 79705528bbaa1726ee7c394c28a769a65553847a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 17 Nov 2024 23:27:41 -0500 Subject: [PATCH 2/2] Revert "Update mod.rs" This reverts commit 60b8d12bada8fd1e64abe78ef1c1873ffb475093. These changes were associated with porting from zip 0.6 to 2. See: Concerns with zip version 1.x https://github.com/astral-sh/uv/issues/3642 --- src/tests/read/zip64/mod.rs | 7 +++---- src/tests/write/zip64/mod.rs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tests/read/zip64/mod.rs b/src/tests/read/zip64/mod.rs index 7549d63..758d410 100644 --- a/src/tests/read/zip64/mod.rs +++ b/src/tests/read/zip64/mod.rs @@ -58,7 +58,7 @@ async fn test_read_zip64_archive_stream() { #[cfg(feature = "tokio")] fn generate_zip64many_zip() -> std::path::PathBuf { use std::io::Write; - use zip::write::{ExtendedFileOptions, FileOptions}; + use zip::write::FileOptions; let mut path = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); path.push("src/tests/read/zip64/zip64many.zip"); @@ -70,11 +70,10 @@ fn generate_zip64many_zip() -> std::path::PathBuf { let zip_file = std::fs::File::create(&path).unwrap(); let mut zip = zip::ZipWriter::new(zip_file); - let options: FileOptions<'_, ExtendedFileOptions> = - FileOptions::default().compression_method(zip::CompressionMethod::Stored); + let options = FileOptions::default().compression_method(zip::CompressionMethod::Stored); for i in 0..2_u32.pow(16) + 1 { - zip.start_file(format!("{i}.txt"), options.clone()).unwrap(); + zip.start_file(format!("{i}.txt"), options).unwrap(); zip.write_all(b"\n").unwrap(); } diff --git a/src/tests/write/zip64/mod.rs b/src/tests/write/zip64/mod.rs index 35e26ff..01f3211 100644 --- a/src/tests/write/zip64/mod.rs +++ b/src/tests/write/zip64/mod.rs @@ -36,7 +36,7 @@ async fn test_write_zip64_file() { let cursor = std::io::Cursor::new(buffer); let mut zip = zip::read::ZipArchive::new(cursor).unwrap(); let mut file1 = zip.by_name("file1").unwrap(); - assert_eq!(file1.extra_data(), Some(&[] as &[u8])); + assert_eq!(file1.extra_data(), &[] as &[u8]); let mut buffer = Vec::new(); file1.read_to_end(&mut buffer).unwrap(); assert_eq!(buffer.as_slice(), &[0, 0, 0, 0]); -- 2.47.0