From 15f124f1811cff03c19768b77f1c3fb5ee67704b Mon Sep 17 00:00:00 2001
From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
Date: Tue, 7 May 2024 21:50:52 -0700
Subject: [PATCH 1/3] style: Fix formatting and Clippy warnings

---
 src/write.rs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/write.rs b/src/write.rs
index 5940256a..735d69f7 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -1969,12 +1969,12 @@ mod test {
     use crate::result::ZipResult;
     use crate::types::DateTime;
     use crate::write::SimpleFileOptions;
+    use crate::AesMode::Aes128;
     use crate::CompressionMethod::{Deflated, Stored};
     use crate::ZipArchive;
     use std::io;
-    use std::io::{Cursor, Read, Seek, SeekFrom, Write};
+    use std::io::{Cursor, Read, Write};
     use std::path::PathBuf;
-    use crate::AesMode::Aes128;
 
     #[test]
     fn write_empty_zip() {
@@ -2472,23 +2472,25 @@ mod test {
         let written = writer.finish().unwrap();
         let _ = ZipWriter::new_append(written).unwrap();
     }
-    
+
     #[cfg(all(feature = "_deflate-any", feature = "aes-crypto"))]
     #[test]
     fn test_fuzz_failure_2024_05_08() -> ZipResult<()> {
         let mut first_writer = ZipWriter::new(Cursor::new(Vec::new()));
         let mut second_writer = ZipWriter::new(Cursor::new(Vec::new()));
-        let options = SimpleFileOptions::default().compression_method(Stored)
-            .with_alignment(46036); 
+        let options = SimpleFileOptions::default()
+            .compression_method(Stored)
+            .with_alignment(46036);
         second_writer.add_symlink("\0", "", options)?;
-        let mut second_archive = second_writer.finish_into_readable()?.into_inner();
-        second_archive.seek(SeekFrom::Start(0))?;
+        let second_archive = second_writer.finish_into_readable()?.into_inner();
         let mut second_writer = ZipWriter::new_append(second_archive)?;
-        let options = SimpleFileOptions::default().compression_method(Deflated)
-            .large_file(true).with_alignment(46036).with_aes_encryption(Aes128, "\0\0");
+        let options = SimpleFileOptions::default()
+            .compression_method(Deflated)
+            .large_file(true)
+            .with_alignment(46036)
+            .with_aes_encryption(Aes128, "\0\0");
         second_writer.add_symlink("", "", options)?;
-        let mut second_archive = second_writer.finish_into_readable()?.into_inner();
-        second_archive.seek(SeekFrom::Start(0))?;
+        let second_archive = second_writer.finish_into_readable()?.into_inner();
         let mut second_writer = ZipWriter::new_append(second_archive)?;
         let options = SimpleFileOptions::default().compression_method(Stored);
         second_writer.start_file(" ", options)?;

From d5b4c6186d08bb6c2958bafd65b45bfe4dca9264 Mon Sep 17 00:00:00 2001
From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
Date: Tue, 7 May 2024 21:52:11 -0700
Subject: [PATCH 2/3] style: Fix conditionally-unused import

---
 src/write.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/write.rs b/src/write.rs
index 735d69f7..f6c809ef 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -1969,9 +1969,8 @@ mod test {
     use crate::result::ZipResult;
     use crate::types::DateTime;
     use crate::write::SimpleFileOptions;
-    use crate::AesMode::Aes128;
     use crate::CompressionMethod::{Deflated, Stored};
-    use crate::ZipArchive;
+    use crate::{AesMode, ZipArchive};
     use std::io;
     use std::io::{Cursor, Read, Write};
     use std::path::PathBuf;
@@ -2488,7 +2487,7 @@ mod test {
             .compression_method(Deflated)
             .large_file(true)
             .with_alignment(46036)
-            .with_aes_encryption(Aes128, "\0\0");
+            .with_aes_encryption(AesMode::Aes128, "\0\0");
         second_writer.add_symlink("", "", options)?;
         let second_archive = second_writer.finish_into_readable()?.into_inner();
         let mut second_writer = ZipWriter::new_append(second_archive)?;

From 0c9be885cbb0e7edefedce4e491c417f6e467f76 Mon Sep 17 00:00:00 2001
From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
Date: Tue, 7 May 2024 22:09:30 -0700
Subject: [PATCH 3/3] style: Fix more conditionally-unused imports

---
 src/write.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/write.rs b/src/write.rs
index f6c809ef..0d239e17 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -1969,8 +1969,8 @@ mod test {
     use crate::result::ZipResult;
     use crate::types::DateTime;
     use crate::write::SimpleFileOptions;
-    use crate::CompressionMethod::{Deflated, Stored};
-    use crate::{AesMode, ZipArchive};
+    use crate::CompressionMethod::Stored;
+    use crate::ZipArchive;
     use std::io;
     use std::io::{Cursor, Read, Write};
     use std::path::PathBuf;
@@ -2484,10 +2484,10 @@ mod test {
         let second_archive = second_writer.finish_into_readable()?.into_inner();
         let mut second_writer = ZipWriter::new_append(second_archive)?;
         let options = SimpleFileOptions::default()
-            .compression_method(Deflated)
+            .compression_method(CompressionMethod::Deflated)
             .large_file(true)
             .with_alignment(46036)
-            .with_aes_encryption(AesMode::Aes128, "\0\0");
+            .with_aes_encryption(crate::AesMode::Aes128, "\0\0");
         second_writer.add_symlink("", "", options)?;
         let second_archive = second_writer.finish_into_readable()?.into_inner();
         let mut second_writer = ZipWriter::new_append(second_archive)?;