From 083d95bcd1957af796504a0fd2b15512ae5e7be2 Mon Sep 17 00:00:00 2001 From: Jack Fletcher Date: Sun, 30 Jan 2022 20:37:46 +0000 Subject: [PATCH 1/2] Update SUPPORTED_METHODS const name --- src/compression.rs | 8 ++++---- src/lib.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compression.rs b/src/compression.rs index 18da9b0b..1729deb5 100644 --- a/src/compression.rs +++ b/src/compression.rs @@ -131,7 +131,7 @@ impl fmt::Display for CompressionMethod { } /// The compression methods which have been implemented. -pub const SUPPORTED_METHODS: &[CompressionMethod] = &[ +pub const SUPPORTED_COMPRESSION_METHODS: &[CompressionMethod] = &[ CompressionMethod::Stored, #[cfg(any( feature = "deflate", @@ -147,7 +147,7 @@ pub const SUPPORTED_METHODS: &[CompressionMethod] = &[ #[cfg(test)] mod test { - use super::{CompressionMethod, SUPPORTED_METHODS}; + use super::{CompressionMethod, SUPPORTED_COMPRESSION_METHODS}; #[test] fn from_eq_to() { @@ -172,7 +172,7 @@ mod test { assert_eq!(to, back); } - for &method in SUPPORTED_METHODS { + for &method in SUPPORTED_COMPRESSION_METHODS { check_match(method); } } @@ -185,7 +185,7 @@ mod test { assert_eq!(debug_str, display_str); } - for &method in SUPPORTED_METHODS { + for &method in SUPPORTED_COMPRESSION_METHODS { check_match(method); } } diff --git a/src/lib.rs b/src/lib.rs index f2b8cf7b..03005634 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ #![warn(missing_docs)] -pub use crate::compression::{CompressionMethod, SUPPORTED_METHODS}; +pub use crate::compression::{CompressionMethod, SUPPORTED_COMPRESSION_METHODS}; pub use crate::read::ZipArchive; pub use crate::types::DateTime; pub use crate::write::ZipWriter; From b444664d71a33e519cdc7450343ef24b9dfa6b52 Mon Sep 17 00:00:00 2001 From: Jack Fletcher Date: Sun, 30 Jan 2022 20:39:43 +0000 Subject: [PATCH 2/2] Apply formatter fixes --- src/compression.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/compression.rs b/src/compression.rs index 1729deb5..8b351478 100644 --- a/src/compression.rs +++ b/src/compression.rs @@ -132,17 +132,17 @@ impl fmt::Display for CompressionMethod { /// The compression methods which have been implemented. pub const SUPPORTED_COMPRESSION_METHODS: &[CompressionMethod] = &[ - CompressionMethod::Stored, - #[cfg(any( - feature = "deflate", - feature = "deflate-miniz", - feature = "deflate-zlib" - ))] - CompressionMethod::Deflated, - #[cfg(feature = "bzip2")] - CompressionMethod::Bzip2, - #[cfg(feature = "zstd")] - CompressionMethod::Zstd, + CompressionMethod::Stored, + #[cfg(any( + feature = "deflate", + feature = "deflate-miniz", + feature = "deflate-zlib" + ))] + CompressionMethod::Deflated, + #[cfg(feature = "bzip2")] + CompressionMethod::Bzip2, + #[cfg(feature = "zstd")] + CompressionMethod::Zstd, ]; #[cfg(test)]