fix compile after prolonged absence

Author: cosmicexplorer

cli/Cargo.toml

@@ -39,8 +39,8 @@ chrono = ["zip/chrono"]
 deflate64 = ["zip/deflate64"]
 deflate = ["zip/deflate"]
 deflate-flate2 = ["zip/deflate-flate2"]
-deflate-zlib = ["zip/deflate-zlib"]
-deflate-zlib-ng = ["zip/deflate-zlib-ng"]
+deflate-flate2-zlib-rs = ["zip/deflate-flate2-zlib-rs"]
+deflate-flate2-zlib = ["zip/deflate-flate2-zlib"]
 deflate-zopfli = ["zip/deflate-zopfli"]
 lzma = ["zip/lzma"]
 time = ["zip/time"]

cli/clite/Cargo.toml

@@ -26,7 +26,7 @@ path = ".."
 default-features = false
 features = [
     "deflate-flate2",
-    "deflate-zlib",
+    "deflate-flate2-zlib-rs",
 ]
 
 [features]

cli/src/extract.rs

@@ -19,7 +19,7 @@ use entries::{IterateEntries, StreamInput, ZipFileInput};
 use receiver::{CompiledEntrySpec, EntryData, EntryKind, EntryReceiver, ExtractEntry};
 
 fn maybe_process_symlink<'a, 't>(
-    entry: &mut ZipFile<'a>,
+    entry: &mut ZipFile<'a, impl Read>,
     err: &Rc<RefCell<impl Write>>,
     symlink_target: &'t mut Vec<u8>,
 ) -> Result<Option<&'t mut [u8]>, CommandError> {
@@ -54,7 +54,7 @@ fn maybe_process_symlink<'a, 't>(
 }
 
 fn process_entry<'a, 'w, 'c, 'it>(
-    mut entry: ZipFile<'a>,
+    mut entry: ZipFile<'a, impl Read>,
     err: &Rc<RefCell<impl Write>>,
     compiled_specs: impl Iterator<Item = &'it CompiledEntrySpec<'w>>,
     copy_buf: &mut [u8],

cli/src/extract/entries.rs

@@ -7,8 +7,8 @@ use zip::{
 
 use crate::{CommandError, WrapCommandErr};
 
-pub trait IterateEntries {
-    fn next_entry(&mut self) -> Result<Option<ZipFile>, CommandError>;
+pub trait IterateEntries<R: io::Read> {
+    fn next_entry(&mut self) -> Result<Option<ZipFile<R>>, CommandError>;
 }
 
 pub struct ReadChecker<R> {
@@ -70,11 +70,11 @@ impl<R> StreamInput<R> {
     }
 }
 
-impl<R> IterateEntries for StreamInput<R>
+impl<R> IterateEntries<ReadChecker<R>> for StreamInput<R>
 where
     R: io::Read,
 {
-    fn next_entry(&mut self) -> Result<Option<ZipFile>, CommandError> {
+    fn next_entry(&mut self) -> Result<Option<ZipFile<ReadChecker<R>>>, CommandError> {
         if let Some(entry) = read_zipfile_from_stream(&mut self.inner)
             .wrap_err("failed to read zip entries from stdin")?
         {
@@ -114,11 +114,11 @@ where
     }
 }
 
-impl<A> IterateEntries for ZipFileInput<A>
+impl<A> IterateEntries<fs::File> for ZipFileInput<A>
 where
     A: ops::DerefMut<Target = ZipArchive<fs::File>>,
 {
-    fn next_entry(&mut self) -> Result<Option<ZipFile>, CommandError> {
+    fn next_entry(&mut self) -> Result<Option<ZipFile<fs::File>>, CommandError> {
         if self.none_left() {
             return Ok(None);
         }

cli/src/extract/receiver.rs

@@ -2,7 +2,7 @@ use std::{
     borrow::Cow,
     cell::RefCell,
     fmt, fs,
-    io::{self, Write},
+    io::{self, Read, Write},
     mem,
     path::{Path, PathBuf},
     rc::Rc,
@@ -44,7 +44,7 @@ pub struct EntryData<'a> {
 
 impl<'a> EntryData<'a> {
     #[inline(always)]
-    pub fn from_entry<'b>(entry: &'a ZipFile<'b>) -> Self {
+    pub fn from_entry<'b>(entry: &'a ZipFile<'b, impl Read>) -> Self {
         Self {
             name: entry.name(),
             kind: if entry.is_dir() {
@@ -68,6 +68,7 @@ impl<'a> EntryData<'a> {
                 .extra_data_fields()
                 .find_map(|f| match f {
                     ExtraField::ExtendedTimestamp(ts) => Some(ts),
+                    ExtraField::Ntfs(_) => todo!(),
                 })
                 .cloned(),
         }

cli/src/info.rs

@@ -1,6 +1,6 @@
 use std::{
     fs,
-    io::{self, Write},
+    io::{self, Read, Write},
     path::PathBuf,
 };
 
@@ -47,12 +47,12 @@ impl ArchiveWithPath {
     }
 }
 
-fn format_entry_info(
+fn format_entry_info<R: Read>(
     mut err: impl Write,
     entry_formatter: &CompiledFormatSpec<CompiledEntryDirective>,
     matcher: Option<&CompiledMatcher>,
     mut output_stream: impl Write,
-    source: &mut impl IterateEntries,
+    source: &mut impl IterateEntries<R>,
 ) -> Result<(), CommandError> {
     if entry_formatter.is_empty() {
         writeln!(

src/types.rs

@@ -1226,7 +1226,7 @@ impl FixedSizeBlock for Zip64DataDescriptorBlock {
 ///
 /// According to the [specification](https://www.winzip.com/win/en/aes_info.html#winzip11) AE-2
 /// does not make use of the CRC check.
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
 #[repr(u16)]
 pub enum AesVendorVersion {
     Ae1 = 0x0001,

src/write.rs

@@ -246,6 +246,7 @@ pub(crate) enum EncryptWith<'k> {
 impl hash::Hash for EncryptWith<'_> {
     fn hash<H: hash::Hasher>(&self, state: &mut H) {
         match self {
+            #[cfg(feature = "aes-crypto")]
             Self::Aes {mode, password} => {
                 mode.hash(state);
                 password.hash(state);