From c7b599c1fe7c0872c541804fb7a819da722f6c52 Mon Sep 17 00:00:00 2001
From: Alexander Zaitsev <zamazan4ik@tut.by>
Date: Thu, 17 Feb 2022 21:42:56 +0300
Subject: [PATCH] fix: release preparation

- mark CompressionMethod enum as non-exhaustive
- add again Aes to enum

Tested:
- Local unit-tests run
---
 src/compression.rs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/compression.rs b/src/compression.rs
index 8e93d3d0..abd8b530 100644
--- a/src/compression.rs
+++ b/src/compression.rs
@@ -11,6 +11,7 @@ use std::fmt;
 /// When creating ZIP files, you may choose the method to use with
 /// [`crate::write::FileOptions::compression_method`]
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
+#[non_exhaustive]
 pub enum CompressionMethod {
     /// Store the file as is
     Stored,
@@ -24,6 +25,12 @@ pub enum CompressionMethod {
     /// Compress the file using BZIP2
     #[cfg(feature = "bzip2")]
     Bzip2,
+    /// Encrypted using AES.
+    ///
+    /// The actual compression method has to be taken from the AES extra data field
+    /// or from `ZipFileData`.
+    #[cfg(feature = "aes-crypto")]
+    Aes,
     /// Compress the file using ZStandard
     #[cfg(feature = "zstd")]
     Zstd,
@@ -72,10 +79,9 @@ impl CompressionMethod {
     pub const JPEG: Self = CompressionMethod::Unsupported(96);
     pub const WAVPACK: Self = CompressionMethod::Unsupported(97);
     pub const PPMD: Self = CompressionMethod::Unsupported(98);
-    /// Encrypted using AES.
-    ///
-    /// The actual compression method has to be taken from the AES extra data field
-    /// or from `ZipFileData`.
+    #[cfg(feature = "aes-crypto")]
+    pub const AES: Self = CompressionMethod::Aes;
+    #[cfg(not(feature = "aes-crypto"))]
     pub const AES: Self = CompressionMethod::Unsupported(99);
 }
 impl CompressionMethod {
@@ -98,7 +104,8 @@ impl CompressionMethod {
             12 => CompressionMethod::Bzip2,
             #[cfg(feature = "zstd")]
             93 => CompressionMethod::Zstd,
-            99 => CompressionMethod::AES,
+            #[cfg(feature = "aes-crypto")]
+            99 => CompressionMethod::Aes,
 
             v => CompressionMethod::Unsupported(v),
         }
@@ -121,7 +128,8 @@ impl CompressionMethod {
             CompressionMethod::Deflated => 8,
             #[cfg(feature = "bzip2")]
             CompressionMethod::Bzip2 => 12,
-            CompressionMethod::AES => 99,
+            #[cfg(feature = "aes-crypto")]
+            CompressionMethod::Aes => 99,
             #[cfg(feature = "zstd")]
             CompressionMethod::Zstd => 93,