From 682a9ba801063835b091f05aa6e0e132e7a5c394 Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Wed, 30 Aug 2023 00:55:30 +0200 Subject: [PATCH] chore: fix wrong formatting (cargo fmt / rustfmt) --- src/unstable.rs | 4 ++-- src/write.rs | 11 ++++++++--- tests/zip_crypto.rs | 10 +++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/unstable.rs b/src/unstable.rs index f8b46a970..cc03ff9a0 100644 --- a/src/unstable.rs +++ b/src/unstable.rs @@ -8,7 +8,7 @@ pub mod write { /// Unstable methods for [`FileOptions`]. pub trait FileOptionsExt { /// Write the file with the given password using the deprecated ZipCrypto algorithm. - /// + /// /// This is not recommended for new archives, as ZipCrypto is not secure. fn with_deprecated_encryption(self, password: &[u8]) -> Self; } @@ -17,4 +17,4 @@ pub mod write { self.with_deprecated_encryption(password) } } -} \ No newline at end of file +} diff --git a/src/write.rs b/src/write.rs index cfa43306c..94f84daee 100644 --- a/src/write.rs +++ b/src/write.rs @@ -410,7 +410,11 @@ impl ZipWriter { self.files.push(file); } if let Some(keys) = options.encrypt_with { - let mut zipwriter = crate::zipcrypto::ZipCryptoWriter { writer: core::mem::replace(&mut self.inner, GenericZipWriter::Closed).unwrap(), buffer: vec![], keys }; + let mut zipwriter = crate::zipcrypto::ZipCryptoWriter { + writer: core::mem::replace(&mut self.inner, GenericZipWriter::Closed).unwrap(), + buffer: vec![], + keys, + }; let crypto_header = [0u8; 12]; zipwriter.write_all(&crypto_header)?; @@ -428,10 +432,11 @@ impl ZipWriter { match core::mem::replace(&mut self.inner, GenericZipWriter::Closed) { GenericZipWriter::Storer(MaybeEncrypted::Encrypted(writer)) => { let crc32 = self.stats.hasher.clone().finalize(); - self.inner = GenericZipWriter::Storer(MaybeEncrypted::Unencrypted(writer.finish(crc32)?)) + self.inner = + GenericZipWriter::Storer(MaybeEncrypted::Unencrypted(writer.finish(crc32)?)) } GenericZipWriter::Storer(w) => self.inner = GenericZipWriter::Storer(w), - _ => unreachable!() + _ => unreachable!(), } let writer = self.inner.get_plain(); diff --git a/tests/zip_crypto.rs b/tests/zip_crypto.rs index d831c1e62..a9b96719c 100644 --- a/tests/zip_crypto.rs +++ b/tests/zip_crypto.rs @@ -22,11 +22,16 @@ use std::io::Read; #[test] fn encrypting_file() { - use zip::unstable::write::FileOptionsExt; use std::io::{Read, Write}; + use zip::unstable::write::FileOptionsExt; let mut buf = vec![0; 2048]; let mut archive = zip::write::ZipWriter::new(std::io::Cursor::new(&mut buf)); - archive.start_file("name", zip::write::FileOptions::default().with_deprecated_encryption(b"password")).unwrap(); + archive + .start_file( + "name", + zip::write::FileOptions::default().with_deprecated_encryption(b"password"), + ) + .unwrap(); archive.write_all(b"test").unwrap(); archive.finish().unwrap(); drop(archive); @@ -35,7 +40,6 @@ fn encrypting_file() { let mut buf = Vec::new(); file.read_to_end(&mut buf).unwrap(); assert_eq!(buf, b"test"); - } #[test] fn encrypted_file() {