Merge pull request #44 from zip-rs/oldpr421

fix: Improve ErrorKind in ZipError to io::Error conversion

Cargo.toml

@@ -16,6 +16,7 @@ Library to support the reading and writing of zip files.
 """
 edition = "2021"
 exclude = ["tests/**", "examples/**", ".github/**", "fuzz/**"]
+build = "src/build.rs"
 
 [workspace.dependencies]
 time = { version = "0.3.36", default-features = false }

src/build.rs

@@ -0,0 +1,7 @@
+use std::env::var;
+
+fn main() {
+    if var("CARGO_FEATURE_DEFLATE_MINIZ").is_ok() {
+        println!("cargo:warning=Feature `deflate-miniz` is deprecated; replace it with `deflate`");
+    }
+}

src/result.rs

@@ -79,7 +79,15 @@ impl ZipError {
 
 impl From<ZipError> for io::Error {
     fn from(err: ZipError) -> io::Error {
-        io::Error::new(io::ErrorKind::Other, err)
+        let kind = match &err {
+            ZipError::Io(err) => err.kind(),
+            ZipError::InvalidArchive(_) => io::ErrorKind::InvalidData,
+            ZipError::UnsupportedArchive(_) => io::ErrorKind::Unsupported,
+            ZipError::FileNotFound => io::ErrorKind::NotFound,
+            ZipError::InvalidPassword => io::ErrorKind::InvalidInput,
+        };
+
+        io::Error::new(kind, err)
     }
 }