From 181942da1ebbbd88e1b2815baf6c0db38de6dca5 Mon Sep 17 00:00:00 2001
From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
Date: Tue, 28 May 2024 09:17:28 -0700
Subject: [PATCH] ci(fuzz): Fix build errors for fuzz_write

---
 fuzz/fuzz_targets/fuzz_write.rs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/fuzz/fuzz_targets/fuzz_write.rs b/fuzz/fuzz_targets/fuzz_write.rs
index a7b808d1..55779a20 100755
--- a/fuzz/fuzz_targets/fuzz_write.rs
+++ b/fuzz/fuzz_targets/fuzz_write.rs
@@ -6,7 +6,6 @@ use libfuzzer_sys::fuzz_target;
 use replace_with::replace_with_or_abort;
 use std::io::{Cursor, Read, Seek, Write};
 use std::path::PathBuf;
-use zip::result::ZipError;
 
 #[derive(Arbitrary, Clone)]
 pub enum BasicFileOperation<'k> {
@@ -160,25 +159,25 @@ where
             for chunk in contents.iter() {
                 writer.write_all(&chunk)?;
             }
-            files_added += 1;
+            *files_added += 1;
         }
         BasicFileOperation::WriteDirectory(options) => {
             writer.add_directory_from_path(path, options.to_owned())?;
-            files_added += 1;
+            *files_added += 1;
         }
         BasicFileOperation::WriteSymlinkWithTarget { target, options } => {
             writer.add_symlink_from_path(&path, target, options.to_owned())?;
-            files_added += 1;
+            *files_added += 1;
         }
         BasicFileOperation::ShallowCopy(base) => {
-            do_operation(writer, &base, false, flush_on_finish_file)?;
+            do_operation(writer, &base, false, flush_on_finish_file, files_added)?;
             writer.shallow_copy_file_from_path(&base.path, &path)?;
-            files_added += 1;
+            *files_added += 1;
         }
         BasicFileOperation::DeepCopy(base) => {
-            do_operation(writer, &base, false, flush_on_finish_file)?;
+            do_operation(writer, &base, false, flush_on_finish_file, files_added)?;
             writer.deep_copy_file_from_path(&base.path, &path)?;
-            files_added += 1;
+            *files_added += 1;
         }
         BasicFileOperation::MergeWithOtherFile { operations } => {
             let mut other_writer = zip::ZipWriter::new(Cursor::new(Vec::new()));
@@ -193,12 +192,12 @@ where
                 );
             });
             writer.merge_archive(other_writer.finish_into_readable()?)?;
-            files_added += inner_files_added;
+            *files_added += inner_files_added;
         }
     }
-    if abort && files_added != 0 {
+    if abort && *files_added != 0 {
         writer.abort_file()?;
-        files_added -= 1;
+        *files_added -= 1;
     }
     let old_comment = writer.get_raw_comment().to_owned();
     match operation.reopen {