From 6c4ae5333a1860ca3b183953409f447adbeeed0a Mon Sep 17 00:00:00 2001 From: Chris Hennick Date: Mon, 8 May 2023 18:55:28 -0700 Subject: [PATCH] Fix merge --- CHANGELOG.md | 4 ++-- tests/zip_crypto.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a64c400..da190dc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,5 +116,5 @@ ### Changed -- Added experimental [`zip::unstable::write::FileOptions::with_deprecated_encryption`] API to enable encrypting files - with PKWARE encryption. +- Added experimental [`zip_next::unstable::write::FileOptions::with_deprecated_encryption`] API to enable encrypting + files with PKWARE encryption. diff --git a/tests/zip_crypto.rs b/tests/zip_crypto.rs index 0f112cf5..45612aac 100644 --- a/tests/zip_crypto.rs +++ b/tests/zip_crypto.rs @@ -23,19 +23,19 @@ use std::io::Read; #[test] fn encrypting_file() { use std::io::{Read, Write}; - use zip::unstable::write::FileOptionsExt; + use zip_next::unstable::write::FileOptionsExt; let mut buf = vec![0; 2048]; - let mut archive = zip::write::ZipWriter::new(Cursor::new(&mut buf)); + let mut archive = zip_next::write::ZipWriter::new(Cursor::new(&mut buf)); archive .start_file( "name", - zip::write::FileOptions::default().with_deprecated_encryption(b"password"), + zip_next::write::FileOptions::default().with_deprecated_encryption(b"password"), ) .unwrap(); archive.write_all(b"test").unwrap(); archive.finish().unwrap(); drop(archive); - let mut archive = zip::ZipArchive::new(Cursor::new(&mut buf)).unwrap(); + let mut archive = zip_next::ZipArchive::new(Cursor::new(&mut buf)).unwrap(); let mut file = archive.by_index_decrypt(0, b"password").unwrap().unwrap(); let mut buf = Vec::new(); file.read_to_end(&mut buf).unwrap();