Add clippy exclusion for build-script set item, fix clippy issue with…

… eager iterator cloning
AFLplusplus · Aug 31, 2023 · 7f27b9a · 7f27b9a
1 parent 3c77c70
commit 7f27b9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/libafl_libfuzzer/libafl_libfuzzer_runtime/src/merge.rs b/libafl_libfuzzer/libafl_libfuzzer_runtime/src/merge.rs
@@ -201,8 +201,8 @@ pub fn merge(
         let loaded_dirs = options
             .dirs()
             .iter()
+            .filter(|dir| state.corpus().dir_path() != *dir)
             .cloned()
-            .filter(|dir| state.corpus().dir_path() != dir)
             .collect::<Vec<_>>();
         // Load from disk
         state

diff --git a/libafl_libfuzzer/src/lib.rs b/libafl_libfuzzer/src/lib.rs
@@ -79,7 +79,13 @@ use std::ffi::{c_char, c_int};
 
 pub use libfuzzer_sys::*;
 
-#[cfg(all(feature = "embed-runtime", target_family = "unix"))]
+#[cfg(all(
+    feature = "embed-runtime",
+    target_family = "unix",
+    // Disable when building with clippy, as it will complain about the missing environment
+    // variable which is set by the build script, which is not run under clippy.
+    not(feature = "cargo-clippy")
+))]
 pub const LIBAFL_LIBFUZZER_RUNTIME_LIBRARY: &'static [u8] =
     include_bytes!(env!("LIBAFL_LIBFUZZER_RUNTIME_PATH"));
 
@@ -97,7 +103,7 @@ extern "C" {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(feature = "embed-runtime")]
+    #[cfg(all(feature = "embed-runtime", not(feature = "cargo-clippy")))]
     #[test]
     fn test_embed_runtime_sized() {
         use crate::LIBAFL_LIBFUZZER_RUNTIME_LIBRARY;