remove cfg-if dependency by vendoring

Author: cosmicexplorer

Cargo.toml

@@ -35,7 +35,6 @@ edition = "2021"
 [workspace.dependencies]
 afl = "0.15"
 arbitrary = { version = "1.4.1" }
-cfg-if = "1"
 tikv-jemallocator = "0.6.0"
 time = { version = "0.3.37", default-features = false }
 zip = { path = ".", default-features = false }

fuzz_read/Cargo.toml

@@ -6,9 +6,10 @@ publish = false
 
 [dependencies]
 afl.workspace = true
-cfg-if.workspace = true
-tikv-jemallocator.workspace = true
 zip.workspace = true
 
+[target.'cfg(fuzzing)'.dependencies]
+tikv-jemallocator.workspace = true
+
 [features]
 zip-default = ["zip/default"]

fuzz_read/src/main.rs

@@ -3,11 +3,14 @@
 #[cfg(fuzzing)]
 use afl::fuzz;
 use std::io::{Read, Seek, SeekFrom};
+#[cfg(fuzzing)]
 use tikv_jemallocator::Jemalloc;
 use zip::read::read_zipfile_from_stream;
+use zip::macros::cfg_if;
 
 const MAX_BYTES_TO_READ: u64 = 1 << 24;
 
+#[cfg(fuzzing)]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
@@ -27,7 +30,7 @@ fn decompress_all(reader: impl Read + Seek) -> Result<(), Box<dyn std::error::Er
 }
 
 fn main() {
-    cfg_if::cfg_if! {
+    cfg_if! {
         if #[cfg(fuzzing)] {
             fuzz!(|data: &[u8]| {
                 let reader = std::io::Cursor::new(data);

fuzz_write/Cargo.toml

@@ -7,10 +7,11 @@ publish = false
 [dependencies]
 afl.workspace = true
 arbitrary = { workspace = true, features = ["derive"] }
-cfg-if.workspace = true
 replace_with = "0.1.7"
-tikv-jemallocator.workspace = true
 zip = { workspace = true, features = ["arbitrary"] }
 
+[target.'cfg(fuzzing)'.dependencies]
+tikv-jemallocator.workspace = true
+
 [features]
 zip-default = ["zip/default"]

fuzz_write/src/main.rs

@@ -10,11 +10,14 @@ use std::io::Write as IoWrite;
 use std::io::{Cursor, Seek, SeekFrom};
 use std::ops;
 use std::path::PathBuf;
+#[cfg(fuzzing)]
 use tikv_jemallocator::Jemalloc;
+use zip::macros::cfg_if;
 use zip::result::{ZipError, ZipResult};
 use zip::unstable::path_to_string;
 use zip::write::FullFileOptions;
 
+#[cfg(fuzzing)]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
@@ -404,7 +407,7 @@ impl ops::Drop for StdoutWrite {
 }
 
 fn main() {
-    cfg_if::cfg_if! {
+    cfg_if! {
         if #[cfg(fuzzing)] {
             let mut w = NoopWrite::default();
             fuzz!(|data: &[u8]| {

src/lib.rs

@@ -31,7 +31,7 @@
 //!
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![warn(missing_docs)]
-#![allow(unexpected_cfgs)] // Needed for cfg(fuzzing) on nightly as of 2024-05-06
+#![allow(unexpected_cfgs)] // Needed for cfg(fuzzing)
 pub use crate::compression::{CompressionMethod, SUPPORTED_COMPRESSION_METHODS};
 pub use crate::read::HasZipMetadata;
 pub use crate::read::ZipArchive;
@@ -71,3 +71,6 @@ zip = \"="]
 #[doc = "\"\n\
 ```"]
 pub mod unstable;
+
+#[doc(hidden)]
+pub mod macros;

src/macros.rs

@@ -0,0 +1,80 @@
+//! Macros used internally.
+//!
+//! These may technically be exported, but that's only to make them available to internal
+//! project dependencies. The `#[doc(hidden)]` mark indicates that these are not stable or supported
+//! APIs, and should not be relied upon by external dependees.
+
+/// The single macro export of the [`cfg-if`](https://docs.rs/cfg-if) crate.
+///
+/// It is packaged here to avoid pulling in another dependency. The stdlib does the same[^1].
+///
+/// [^1]: https://github.com/rust-lang/rust/blob/a2db9280539229a3b8a084a09886670a57bc7e9c/library/compiler-builtins/libm/src/math/support/macros.rs#L1
+#[doc(hidden)]
+#[macro_export]
+macro_rules! cfg_if {
+    // match if/else chains with a final `else`
+    (
+        $(
+            if #[cfg( $i_meta:meta )] { $( $i_tokens:tt )* }
+        ) else+
+        else { $( $e_tokens:tt )* }
+    ) => {
+        $crate::cfg_if! {
+            @__items () ;
+            $(
+                (( $i_meta ) ( $( $i_tokens )* )) ,
+            )+
+            (() ( $( $e_tokens )* )) ,
+        }
+    };
+
+    // match if/else chains lacking a final `else`
+    (
+        if #[cfg( $i_meta:meta )] { $( $i_tokens:tt )* }
+        $(
+            else if #[cfg( $e_meta:meta )] { $( $e_tokens:tt )* }
+        )*
+    ) => {
+        $crate::cfg_if! {
+            @__items () ;
+            (( $i_meta ) ( $( $i_tokens )* )) ,
+            $(
+                (( $e_meta ) ( $( $e_tokens )* )) ,
+            )*
+        }
+    };
+
+    // Internal and recursive macro to emit all the items
+    //
+    // Collects all the previous cfgs in a list at the beginning, so they can be
+    // negated. After the semicolon are all the remaining items.
+    (@__items ( $( $_:meta , )* ) ; ) => {};
+    (
+        @__items ( $( $no:meta , )* ) ;
+        (( $( $yes:meta )? ) ( $( $tokens:tt )* )) ,
+        $( $rest:tt , )*
+    ) => {
+        // Emit all items within one block, applying an appropriate #[cfg]. The
+        // #[cfg] will require all `$yes` matchers specified and must also negate
+        // all previous matchers.
+        #[cfg(all(
+            $( $yes , )?
+            not(any( $( $no ),* ))
+        ))]
+        $crate::cfg_if! { @__identity $( $tokens )* }
+
+        // Recurse to emit all other items in `$rest`, and when we do so add all
+        // our `$yes` matchers to the list of `$no` matchers as future emissions
+        // will have to negate everything we just matched as well.
+        $crate::cfg_if! {
+            @__items ( $( $no , )* $( $yes , )? ) ;
+            $( $rest , )*
+        }
+    };
+
+    // Internal macro to make __apply work out right for different match types,
+    // because of how macros match/expand stuff.
+    (@__identity $( $tokens:tt )* ) => {
+        $( $tokens )*
+    };
+}