feat(artifacts): Update to zip 1.2 api

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>

gitlab-runner/src/artifact.rs

@@ -1,7 +1,7 @@
 //! Helpers for artifacts downloaded from gitlab
 use std::{
     io::{Read, Seek},
-    path::Path,
+    path::PathBuf,
 };
 
 use zip::{read::ZipFile, result::ZipResult};
@@ -21,7 +21,7 @@ impl ArtifactFile<'_> {
     ///
     /// The path will be safe to use, that is to say it contains no NUL bytes and will be a
     /// relative path that doesn't go outside of the root.
-    pub fn path(&self) -> Option<&Path> {
+    pub fn path(&self) -> Option<PathBuf> {
         self.0.enclosed_name()
     }
 }

gitlab-runner/src/uploader.rs

@@ -38,10 +38,10 @@ enum UploadFileState<'a> {
     ),
 }
 
-fn zip_thread(mut temp: File, mut rx: mpsc::Receiver<UploadRequest>) {
-    let mut zip = zip::ZipWriter::new(&mut temp);
+fn zip_thread(temp: File, mut rx: mpsc::Receiver<UploadRequest>) {
+    let mut zip = zip::ZipWriter::new(temp);
     let options =
-        zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
+        zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
 
     loop {
         if let Some(request) = rx.blocking_recv() {
@@ -57,9 +57,8 @@ fn zip_thread(mut temp: File, mut rx: mpsc::Receiver<UploadRequest>) {
                 }
                 UploadRequest::Finish(tx) => {
                     let r = zip.finish();
-                    drop(zip);
                     let reply = match r {
-                        Ok(_) => temp.rewind().map(|()| temp),
+                        Ok(mut file) => file.rewind().map(|()| file),
                         Err(e) => Err(std::io::Error::new(std::io::ErrorKind::Other, e)),
                     };
                     tx.send(reply).expect("Couldn't send finished zip");