From 405a1919b8be0e6ef924c64451c393a95405ad8b Mon Sep 17 00:00:00 2001
From: Dongjia Zhang <tokazerkje@outlook.com>
Date: Tue, 28 Jun 2022 16:56:28 +0900
Subject: [PATCH] Still fixing ci (#683)

* fix

* fix

* more

* cargo fixed??

* fixed??

* clp

* fix
---
 fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs |  4 +--
 libafl_qemu/build_linux.rs                | 42 ++++++++++-------------
 libafl_qemu/src/emu.rs                    |  1 +
 libafl_qemu/src/lib.rs                    |  1 +
 scripts/test_all_fuzzers.sh               |  4 +--
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs b/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
index d6257c4401..c53ee43df9 100644
--- a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
+++ b/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
@@ -319,7 +319,7 @@ fn fuzz(
         ExitKind::Ok
     };
 
-    let hooks = QemuHooks::new(
+    let mut hooks = QemuHooks::new(
         &emu,
         tuple_list!(
             QemuEdgeCoverageChildHelper::default(),
@@ -328,7 +328,7 @@ fn fuzz(
     );
 
     let executor = QemuForkExecutor::new(
-        hooks,
+        &mut hooks,
         &mut harness,
         tuple_list!(edges_observer, time_observer),
         &mut fuzzer,
diff --git a/libafl_qemu/build_linux.rs b/libafl_qemu/build_linux.rs
index 407815a121..536d035c30 100644
--- a/libafl_qemu/build_linux.rs
+++ b/libafl_qemu/build_linux.rs
@@ -253,29 +253,25 @@ pub fn build() {
         println!("cargo:rustc-env=LD_LIBRARY_PATH={}", target_dir.display());
     } */
 
-    drop(
-        assert!(Command::new("make")
-            .current_dir(&out_dir_path)
-            .env("CC", &cross_cc)
-            .env("OUT_DIR", &target_dir)
-            .arg("-C")
-            .arg(&qasan_dir)
-            .arg("clean")
-            .status()
-            .expect("make failed")
-            .success())
-    );
-    drop(
-        assert!(Command::new("make")
-            .current_dir(&out_dir_path)
-            .env("CC", &cross_cc)
-            .env("OUT_DIR", &target_dir)
-            .arg("-C")
-            .arg(&qasan_dir)
-            .status()
-            .expect("make failed")
-            .success())
-    );
+    assert!(Command::new("make")
+        .current_dir(&out_dir_path)
+        .env("CC", &cross_cc)
+        .env("OUT_DIR", &target_dir)
+        .arg("-C")
+        .arg(&qasan_dir)
+        .arg("clean")
+        .status()
+        .expect("make failed")
+        .success());
+    assert!(Command::new("make")
+        .current_dir(&out_dir_path)
+        .env("CC", &cross_cc)
+        .env("OUT_DIR", &target_dir)
+        .arg("-C")
+        .arg(&qasan_dir)
+        .status()
+        .expect("make failed")
+        .success());
 
     cc::Build::new()
         .warnings(false)
diff --git a/libafl_qemu/src/emu.rs b/libafl_qemu/src/emu.rs
index 614200fef5..f58620d93c 100644
--- a/libafl_qemu/src/emu.rs
+++ b/libafl_qemu/src/emu.rs
@@ -704,6 +704,7 @@ impl Emulator {
         }
     }
 
+    #[allow(clippy::type_complexity)]
     pub fn add_gdb_cmd(&self, callback: Box<dyn FnMut(&Self, &str) -> bool>) {
         unsafe {
             GDB_COMMANDS.push(core::mem::transmute(callback));
diff --git a/libafl_qemu/src/lib.rs b/libafl_qemu/src/lib.rs
index d812deecfe..fa3b8c1b0b 100644
--- a/libafl_qemu/src/lib.rs
+++ b/libafl_qemu/src/lib.rs
@@ -11,6 +11,7 @@
 #![allow(clippy::too_many_arguments)]
 // Till they fix this buggy lint in clippy
 #![allow(clippy::borrow_as_ptr)]
+#![allow(clippy::borrow_deref_ref)]
 // Allow only ATM, it will be evetually removed
 #![allow(clippy::missing_safety_doc)]
 
diff --git a/scripts/test_all_fuzzers.sh b/scripts/test_all_fuzzers.sh
index 2290356de9..c077e541ca 100755
--- a/scripts/test_all_fuzzers.sh
+++ b/scripts/test_all_fuzzers.sh
@@ -5,7 +5,7 @@ cd "$SCRIPT_DIR/.." || exit 1
 
 # TODO: This should be rewritten in rust, a Makefile, or some platform-independent language
 
-fuzzers=$(find ./fuzzers/* -maxdepth 0 -type d)
+fuzzers=$(find ./fuzzers -maxdepth 1 -type d)
 backtrace_fuzzers=$(find ./fuzzers/backtrace_baby_fuzzers -maxdepth 1 -type d)
 
 libafl=$(pwd)
@@ -34,7 +34,7 @@ do
     if [ "$1" != "--no-fmt" ]; then
         
         echo "[*] Checking fmt for $fuzzer"
-        cargo fmt --check || exit 1
+        cargo fmt --all -- --check || exit 1
         echo "[*] Running clippy for $fuzzer"
         cargo clippy || exit 1
     else