From 39c32d55e77a90b9933cf7806d80031af27d0feb Mon Sep 17 00:00:00 2001
From: Romain Malmain <romain.malmain@pm.me>
Date: Thu, 18 Apr 2024 13:33:18 +0200
Subject: [PATCH] Fix main not passing CI tests (#2075)

* Fix sancov import

* fmt

* fmt
---
 fuzzers/forkserver_libafl_cc/src/main.rs  |  8 +++-----
 fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs | 16 +++++++---------
 fuzzers/qemu_cmin/src/fuzzer.rs           |  8 +++-----
 libafl_targets/src/sancov_pcguard.rs      |  3 ++-
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/fuzzers/forkserver_libafl_cc/src/main.rs b/fuzzers/forkserver_libafl_cc/src/main.rs
index 22cde2fed8..46b4b58a93 100644
--- a/fuzzers/forkserver_libafl_cc/src/main.rs
+++ b/fuzzers/forkserver_libafl_cc/src/main.rs
@@ -146,11 +146,9 @@ pub fn main() {
     .unwrap();
 
     // The Monitor trait define how the fuzzer stats are reported to the user
-    let monitor = SimpleMonitor::with_user_monitor(
-        |s| {
-            println!("{s}");
-        }
-    );
+    let monitor = SimpleMonitor::with_user_monitor(|s| {
+        println!("{s}");
+    });
 
     // The event manager handle the various events generated during the fuzzing loop
     // such as the notification of the addition of a new item to the corpus
diff --git a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs b/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
index 84347b0855..f69c45c24d 100644
--- a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
+++ b/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
@@ -198,15 +198,13 @@ fn fuzz(
     let file_null = File::open("/dev/null")?;
 
     // 'While the stats are state, they are usually used in the broker - which is likely never restarted
-    let monitor = SimpleMonitor::with_user_monitor(
-        |s| {
-            #[cfg(unix)]
-            writeln!(&mut stdout_cpy, "{s}").unwrap();
-            #[cfg(windows)]
-            println!("{s}");
-            writeln!(log.borrow_mut(), "{:?} {s}", current_time()).unwrap();
-        }
-    );
+    let monitor = SimpleMonitor::with_user_monitor(|s| {
+        #[cfg(unix)]
+        writeln!(&mut stdout_cpy, "{s}").unwrap();
+        #[cfg(windows)]
+        println!("{s}");
+        writeln!(log.borrow_mut(), "{:?} {s}", current_time()).unwrap();
+    });
 
     let mut shmem_provider = StdShMemProvider::new()?;
 
diff --git a/fuzzers/qemu_cmin/src/fuzzer.rs b/fuzzers/qemu_cmin/src/fuzzer.rs
index 197cf7a87f..6ccb40c1cb 100644
--- a/fuzzers/qemu_cmin/src/fuzzer.rs
+++ b/fuzzers/qemu_cmin/src/fuzzer.rs
@@ -142,11 +142,9 @@ pub fn fuzz() -> Result<(), Error> {
 
     let mut shmem_provider = StdShMemProvider::new().expect("Failed to init shared memory");
 
-    let monitor = SimpleMonitor::with_user_monitor(
-        |s| {
-            println!("{s}");
-        }
-    );
+    let monitor = SimpleMonitor::with_user_monitor(|s| {
+        println!("{s}");
+    });
     let (state, mut mgr) = match SimpleRestartingEventManager::launch(monitor, &mut shmem_provider)
     {
         Ok(res) => res,
diff --git a/libafl_targets/src/sancov_pcguard.rs b/libafl_targets/src/sancov_pcguard.rs
index 1265566814..23277a01c4 100644
--- a/libafl_targets/src/sancov_pcguard.rs
+++ b/libafl_targets/src/sancov_pcguard.rs
@@ -11,7 +11,8 @@ use libafl::executors::{hooks::ExecutorHook, HasObservers};
 #[cfg(any(
     feature = "pointer_maps",
     feature = "sancov_pcguard_edges",
-    feature = "sancov_pcguard_hitcounts"
+    feature = "sancov_pcguard_hitcounts",
+    feature = "sancov_ctx",
 ))]
 use crate::coverage::EDGES_MAP;
 use crate::coverage::MAX_EDGES_NUM;