refactor: Clean up imports and move types

benches/read_metadata.rs

@@ -1,7 +1,7 @@
 use bencher::{benchmark_group, benchmark_main};
 
 use std::fs;
-use std::io::{self, prelude::*, Cursor};
+use std::io::{self, Cursor, Write};
 
 use bencher::Bencher;
 use tempfile::TempDir;

examples/extract_lorem.rs

@@ -1,4 +1,4 @@
-use std::io::prelude::*;
+use std::io::Read;
 
 fn main() {
     std::process::exit(real_main());

examples/write_dir.rs

@@ -2,7 +2,7 @@
 #![allow(dead_code)]
 use anyhow::Context;
 use clap::{Parser, ValueEnum};
-use std::io::prelude::*;
+use std::io::{Read, Seek, Write};
 use zip::{result::ZipError, write::SimpleFileOptions};
 
 use std::fs::File;

examples/write_sample.rs

@@ -1,4 +1,4 @@
-use std::io::prelude::*;
+use std::io::Write;
 use zip::write::SimpleFileOptions;
 #[cfg(feature = "aes-crypto")]
 use zip::{AesMode, CompressionMethod};

fuzz_write/src/main.rs

@@ -254,10 +254,7 @@ fn do_operation(
                 "let mut writer = ZipWriter::new_append(writer.finish()?)?;"
             )?;
             replace_with_or_abort(writer, |old_writer: zip::ZipWriter<Cursor<Vec<u8>>>| {
-                (|| -> ZipResult<zip::ZipWriter<Cursor<Vec<u8>>>> {
-                    zip::ZipWriter::new_append(old_writer.finish()?)
-                })()
-                .unwrap_or_else(|_| {
+                zip::ZipWriter::new_append(old_writer.finish()?).unwrap_or_else(|_| {
                     if panic_on_error {
                         panic!("Failed to create new ZipWriter")
                     }
@@ -275,10 +272,7 @@ fn do_operation(
                 "let mut writer = ZipWriter::new_append(writer.finish()?)?;"
             )?;
             replace_with_or_abort(writer, |old_writer| {
-                (|| -> ZipResult<zip::ZipWriter<Cursor<Vec<u8>>>> {
-                    zip::ZipWriter::new_append(old_writer.finish()?)
-                })()
-                .unwrap_or_else(|_| {
+                zip::ZipWriter::new_append(old_writer.finish()?).unwrap_or_else(|_| {
                     if panic_on_error {
                         panic!("Failed to create new ZipWriter")
                     }

src/aes.rs

@@ -13,7 +13,7 @@ use sha1::Sha1;
 use std::io::{self, Error, ErrorKind, Read, Write};
 use zeroize::{Zeroize, Zeroizing};
 
-/// The length of the password verifcation value in bytes
+/// The length of the password verification value in bytes
 pub const PWD_VERIFY_LENGTH: usize = 2;
 /// The length of the authentication code in bytes
 const AUTH_CODE_LENGTH: usize = 10;

src/aes_ctr.rs

@@ -7,7 +7,7 @@
 use crate::unstable::LittleEndianWriteExt;
 use aes::cipher::generic_array::GenericArray;
 use aes::cipher::{BlockEncrypt, KeyInit};
-use std::{any, fmt};
+use core::{any, fmt};
 
 /// Internal block size of an AES cipher.
 const AES_BLOCK_SIZE: usize = 16;
@@ -153,7 +153,7 @@ mod tests {
     use aes::cipher::{BlockEncrypt, KeyInit};
 
     /// Checks whether `crypt_in_place` produces the correct plaintext after one use and yields the
-    /// cipertext again after applying it again.
+    /// ciphertext again after applying it again.
     fn roundtrip<Aes>(key: &[u8], ciphertext: &[u8], expected_plaintext: &[u8])
     where
         Aes: AesKind,

src/compression.rs

@@ -1,6 +1,7 @@
 //! Possible ZIP compression methods.
 
-use std::{fmt, io};
+use core::fmt;
+use std::io;
 
 #[allow(deprecated)]
 /// Identifies the storage format used to compress a file within a ZIP archive.

src/crc32.rs

@@ -1,7 +1,6 @@
 //! Helper module to compute a CRC32 checksum
 
-use std::io;
-use std::io::prelude::*;
+use std::io::{self, Read};
 
 use crc32fast::Hasher;
 
@@ -85,7 +84,9 @@ impl<R: Read> Read for Crc32Reader<R> {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use std::io::Read;
+
+    use super::Crc32Reader;
 
     #[test]
     fn test_empty_reader() {

src/extra_fields/mod.rs

@@ -22,7 +22,7 @@ mod zipinfo_utf8;
 
 pub use extended_timestamp::*;
 pub use ntfs::Ntfs;
-pub use zipinfo_utf8::*;
+pub use zipinfo_utf8::UnicodeExtraField;
 
 /// contains one extra field
 #[derive(Debug, Clone)]

src/lib.rs

@@ -15,20 +15,20 @@
 //!
 //! This is a list of supported features:
 //!
-//! |         | Reading | Writing |
-//! | ------- | ------  | ------- |
-//! | Stored | ✅ | ✅ |
-//! | Deflate | ✅ [->](`crate::ZipArchive::by_name`)      | ✅ [->](`crate::write::FileOptions::compression_method`) |
-//! | Deflate64 | ✅ | |
-//! | Bzip2 | ✅ | ✅ |
-//! | ZStandard | ✅ | ✅ |
-//! | LZMA | ✅ | |
-//! | XZ | ✅ | ✅ |
-//! | PPMd | ✅ | ✅ |
-//! | AES encryption | ✅ | ✅ |
-//! | ZipCrypto deprecated encryption | ✅ | ✅ |
-//!
+//! |                                 | Reading                               | Writing                                                  |
+//! | ------------------------------- | ------------------------------------- | -------------------------------------------------------- |
+//! | Stored                          | ✅                                    | ✅                                                       |
+//! | Deflate                         | ✅ [->](`crate::ZipArchive::by_name`) | ✅ [->](`crate::write::FileOptions::compression_method`) |
+//! | Deflate64                       | ✅                                    |                                                          |
+//! | Bzip2                           | ✅                                    | ✅                                                       |
+//! | ZStandard                       | ✅                                    | ✅                                                       |
+//! | LZMA                            | ✅                                    |                                                          |
+//! | XZ                              | ✅                                    | ✅                                                       |
+//! | PPMd                            | ✅                                    | ✅                                                       |
+//! | AES encryption                  | ✅                                    | ✅                                                       |
+//! | ZipCrypto deprecated encryption | ✅                                    | ✅                                                       |
 //!
+
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![warn(missing_docs)]
 #![allow(unexpected_cfgs)] // Needed for cfg(fuzzing) on nightly as of 2024-05-06

src/read.rs

@@ -6,31 +6,27 @@ use crate::compression::{CompressionMethod, Decompressor};
 use crate::cp437::FromCp437;
 use crate::crc32::Crc32Reader;
 use crate::extra_fields::{ExtendedTimestamp, ExtraField, Ntfs};
-use crate::read::zip_archive::{Shared, SharedBuilder};
-use crate::result::invalid;
-use crate::result::{ZipError, ZipResult};
-use crate::spec::{self, CentralDirectoryEndInfo, DataAndPosition, FixedSizeBlock, Pod};
+use crate::result::{invalid, ZipError, ZipResult};
+use crate::spec::{
+    self, CentralDirectoryEndInfo, DataAndPosition, FixedSizeBlock, Pod, ZIP64_BYTES_THR,
+};
 use crate::types::{
-    AesMode, AesVendorVersion, DateTime, System, ZipCentralEntryBlock, ZipFileData,
-    ZipLocalEntryBlock,
+    AesMode, AesVendorVersion, DateTime, SimpleFileOptions, System, ZipCentralEntryBlock,
+    ZipFileData, ZipLocalEntryBlock,
 };
-use crate::write::SimpleFileOptions;
 use crate::zipcrypto::{ZipCryptoReader, ZipCryptoReaderValid, ZipCryptoValidator};
-use crate::ZIP64_BYTES_THR;
+use core::mem::{replace, size_of};
+use core::ops::{Deref, Range};
 use indexmap::IndexMap;
 use std::borrow::Cow;
 use std::ffi::OsStr;
-use std::fs::create_dir_all;
-use std::io::{self, copy, prelude::*, sink, SeekFrom};
-use std::mem;
-use std::mem::size_of;
-use std::ops::{Deref, Range};
+use std::io::{self, copy, sink, Read, Seek, SeekFrom, Write};
 use std::path::{Component, Path, PathBuf};
 use std::sync::{Arc, OnceLock};
 
 mod config;
 
-pub use config::*;
+pub use config::{ArchiveOffset, Config};
 
 /// Provides high level API for reading from a stream.
 pub(crate) mod stream;
@@ -89,7 +85,7 @@ pub(crate) mod zip_archive {
     /// change in the future.
     ///
     /// ```no_run
-    /// use std::io::prelude::*;
+    /// use std::io::{Read, Seek};
     /// fn list_zip_contents(reader: impl Read + Seek) -> zip::result::ZipResult<()> {
     ///     use zip::HasZipMetadata;
     ///     let mut zip = zip::ZipArchive::new(reader)?;
@@ -313,7 +309,8 @@ impl<R: Read> Read for SeekableTake<'_, R> {
 }
 
 pub(crate) fn make_writable_dir_all<T: AsRef<Path>>(outpath: T) -> Result<(), ZipError> {
-    create_dir_all(outpath.as_ref())?;
+    use std::fs;
+    fs::create_dir_all(outpath.as_ref())?;
     #[cfg(unix)]
     {
         // Dirs must be writable until all normal files are extracted
@@ -545,7 +542,7 @@ impl<R> ZipArchive<R> {
             Some((_, file)) => file.header_start,
             None => central_start,
         };
-        let shared = Arc::new(Shared {
+        let shared = Arc::new(zip_archive::Shared {
             files,
             offset: initial_offset,
             dir_start: central_start,
@@ -642,7 +639,7 @@ impl<R: Read + Seek> ZipArchive<R> {
 
     /// Get the directory start offset and number of files. This is done in a
     /// separate function to ease the control flow design.
-    pub(crate) fn get_metadata(config: Config, reader: &mut R) -> ZipResult<Shared> {
+    pub(crate) fn get_metadata(config: Config, reader: &mut R) -> ZipResult<zip_archive::Shared> {
         // End of the probed region, initially set to the end of the file
         let file_len = reader.seek(io::SeekFrom::End(0))?;
         let mut end_exclusive = file_len;
@@ -676,7 +673,7 @@ impl<R: Read + Seek> ZipArchive<R> {
         dir_info: CentralDirectoryInfo,
         config: Config,
         reader: &mut R,
-    ) -> Result<SharedBuilder, ZipError> {
+    ) -> Result<zip_archive::SharedBuilder, ZipError> {
         // If the parsed number of files is greater than the offset then
         // something fishy is going on and we shouldn't trust number_of_files.
         let file_capacity = if dir_info.number_of_files > dir_info.directory_start as usize {
@@ -700,7 +697,7 @@ impl<R: Read + Seek> ZipArchive<R> {
             files.push(file);
         }
 
-        Ok(SharedBuilder {
+        Ok(zip_archive::SharedBuilder {
             files,
             offset: dir_info.archive_offset,
             dir_start: dir_info.directory_start,
@@ -854,7 +851,7 @@ impl<R: Read + Seek> ZipArchive<R> {
     ) -> ZipResult<()> {
         use std::fs;
 
-        create_dir_all(&directory)?;
+        fs::create_dir_all(&directory)?;
         let directory = directory.as_ref().canonicalize()?;
 
         let root_dir = root_dir_filter
@@ -1603,7 +1600,7 @@ impl<'a> ZipReadOptions<'a> {
 /// Methods for retrieving information on zip files
 impl<'a, R: Read> ZipFile<'a, R> {
     pub(crate) fn take_raw_reader(&mut self) -> io::Result<io::Take<&'a mut R>> {
-        mem::replace(&mut self.reader, ZipFileReader::NoReader).into_inner()
+        replace(&mut self.reader, ZipFileReader::NoReader).into_inner()
     }
 
     /// Get the version of the file
@@ -2112,7 +2109,7 @@ fn generate_chrono_datetime(datetime: &DateTime) -> Option<chrono::NaiveDateTime
 mod test {
     use crate::read::ZipReadOptions;
     use crate::result::ZipResult;
-    use crate::write::SimpleFileOptions;
+    use crate::types::SimpleFileOptions;
     use crate::CompressionMethod::Stored;
     use crate::{ZipArchive, ZipWriter};
     use std::io::{Cursor, Read, Write};

src/read/stream.rs

@@ -4,8 +4,6 @@ use super::{
 };
 use crate::spec::FixedSizeBlock;
 use indexmap::IndexMap;
-use std::fs;
-use std::fs::create_dir_all;
 use std::io::{self, Read};
 use std::path::{Path, PathBuf};
 
@@ -58,7 +56,8 @@ impl<R: Read> ZipStreamReader<R> {
     /// Extraction is not atomic; If an error is encountered, some of the files
     /// may be left on disk.
     pub fn extract<P: AsRef<Path>>(self, directory: P) -> ZipResult<()> {
-        create_dir_all(&directory)?;
+        use std::fs;
+        fs::create_dir_all(&directory)?;
         let directory = directory.as_ref().canonicalize()?;
         struct Extractor(PathBuf, IndexMap<Box<str>, ()>);
         impl ZipStreamVisitor for Extractor {
@@ -121,7 +120,7 @@ pub trait ZipStreamVisitor {
     ///     - `external_attributes`: `unix_mode()`: will return None
     fn visit_file<R: Read>(&mut self, file: &mut ZipFile<'_, R>) -> ZipResult<()>;
 
-    /// This function is guranteed to be called after all `visit_file`s.
+    /// This function is guaranteed to be called after all `visit_file`s.
     ///
     ///  * `metadata` - Provides missing metadata in `visit_file`.
     fn visit_additional_metadata(&mut self, metadata: &ZipStreamFileMetadata) -> ZipResult<()>;
@@ -211,11 +210,13 @@ impl ZipStreamFileMetadata {
 mod test {
     use tempfile::TempDir;
 
-    use super::*;
+    use crate::read::stream::{ZipStreamFileMetadata, ZipStreamReader, ZipStreamVisitor};
+    use crate::read::ZipFile;
+    use crate::result::ZipResult;
     use crate::write::SimpleFileOptions;
     use crate::ZipWriter;
     use std::collections::BTreeSet;
-    use std::io::Cursor;
+    use std::io::{Cursor, Read};
 
     struct DummyVisitor;
     impl ZipStreamVisitor for DummyVisitor {
@@ -251,7 +252,7 @@ mod test {
 
     #[test]
     fn invalid_offset() {
-        ZipStreamReader::new(io::Cursor::new(include_bytes!(
+        ZipStreamReader::new(Cursor::new(include_bytes!(
             "../../tests/data/invalid_offset.zip"
         )))
         .visit(&mut DummyVisitor)
@@ -260,7 +261,7 @@ mod test {
 
     #[test]
     fn invalid_offset2() {
-        ZipStreamReader::new(io::Cursor::new(include_bytes!(
+        ZipStreamReader::new(Cursor::new(include_bytes!(
             "../../tests/data/invalid_offset2.zip"
         )))
         .visit(&mut DummyVisitor)
@@ -269,9 +270,8 @@ mod test {
 
     #[test]
     fn zip_read_streaming() {
-        let reader = ZipStreamReader::new(io::Cursor::new(include_bytes!(
-            "../../tests/data/mimetype.zip"
-        )));
+        let reader =
+            ZipStreamReader::new(Cursor::new(include_bytes!("../../tests/data/mimetype.zip")));
 
         #[derive(Default)]
         struct V {
@@ -306,7 +306,7 @@ mod test {
 
     #[test]
     fn file_and_dir_predicates() {
-        let reader = ZipStreamReader::new(io::Cursor::new(include_bytes!(
+        let reader = ZipStreamReader::new(Cursor::new(include_bytes!(
             "../../tests/data/files_and_dirs.zip"
         )));
 
@@ -353,7 +353,7 @@ mod test {
     /// files declared is more than the alleged offset in the CDE
     #[test]
     fn invalid_cde_number_of_files_allocation_smaller_offset() {
-        ZipStreamReader::new(io::Cursor::new(include_bytes!(
+        ZipStreamReader::new(Cursor::new(include_bytes!(
             "../../tests/data/invalid_cde_number_of_files_allocation_smaller_offset.zip"
         )))
         .visit(&mut DummyVisitor)
@@ -365,7 +365,7 @@ mod test {
     /// files declared is less than the alleged offset in the CDE
     #[test]
     fn invalid_cde_number_of_files_allocation_greater_offset() {
-        ZipStreamReader::new(io::Cursor::new(include_bytes!(
+        ZipStreamReader::new(Cursor::new(include_bytes!(
             "../../tests/data/invalid_cde_number_of_files_allocation_greater_offset.zip"
         )))
         .visit(&mut DummyVisitor)