From d663b31fb2c1d05efef13f2559d20e213e01f132 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Fri, 3 May 2024 11:49:09 -0700 Subject: [PATCH] chore: Fix: don't feature-gate all of merge_archive.rs, only the parts that use compression --- benches/merge_archive.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/benches/merge_archive.rs b/benches/merge_archive.rs index e0e9a740..709cd8a5 100644 --- a/benches/merge_archive.rs +++ b/benches/merge_archive.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "_deflate-any")] - use bencher::{benchmark_group, benchmark_main}; use std::io::{Cursor, Read, Seek, Write}; @@ -67,6 +65,7 @@ fn merge_archive_stored(bench: &mut Bencher) { }); } +#[cfg(feature = "_deflate-any")] fn merge_archive_compressed(bench: &mut Bencher) { let options = SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated); let (len, src) = generate_random_archive(NUM_ENTRIES, ENTRY_SIZE, options).unwrap(); @@ -97,6 +96,7 @@ fn merge_archive_raw_copy_file_stored(bench: &mut Bencher) { }); } +#[cfg(feature = "_deflate-any")] fn merge_archive_raw_copy_file_compressed(bench: &mut Bencher) { let options = SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated); let (len, src) = generate_random_archive(NUM_ENTRIES, ENTRY_SIZE, options).unwrap(); @@ -112,6 +112,7 @@ fn merge_archive_raw_copy_file_compressed(bench: &mut Bencher) { }); } +#[cfg(feature = "_deflate-any")] benchmark_group!( benches, merge_archive_stored, @@ -119,4 +120,12 @@ benchmark_group!( merge_archive_raw_copy_file_stored, merge_archive_raw_copy_file_compressed, ); + +#[cfg(not(feature = "_deflate-any"))] +benchmark_group!( + benches, + merge_archive_stored, + merge_archive_raw_copy_file_stored, +); + benchmark_main!(benches);