From 1172b5e5e0d36d1b1f8c53a6cf1fdf70ec0c3be1 Mon Sep 17 00:00:00 2001
From: "Dongjia \"toka\" Zhang" <tokazerkje@outlook.com>
Date: Fri, 6 Sep 2024 14:22:33 +0200
Subject: [PATCH] Fix build and remove dump_state feature (#2513)

* fix

* remove dump_state
---
 libafl/Cargo.toml  |  3 ---
 libafl_cc/build.rs | 26 ++++++++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml
index 872b9f7ecd..88753194fd 100644
--- a/libafl/Cargo.toml
+++ b/libafl/Cargo.toml
@@ -102,9 +102,6 @@ tcp_compression = ["tcp_manager", "libafl_bolts/gzip"]
 ## Enable multi-machine support
 multi_machine = ["tokio", "std", "enumflags2", "ahash/std"]
 
-## Dump state of each client on exit
-dump_state = ["std"]
-
 ## Enables the `NaiveTokenizer` and `StacktraceObserver`
 regex = ["std", "dep:regex"]
 
diff --git a/libafl_cc/build.rs b/libafl_cc/build.rs
index 3ccf228b99..73999f9e34 100644
--- a/libafl_cc/build.rs
+++ b/libafl_cc/build.rs
@@ -200,26 +200,24 @@ fn build_pass(
     };
 
     match command_result {
-        Some(res) => {
-            match res {
-                Ok(s) => {
-                    if !s.success() {
-                        if required {
-                            panic!("Failed to compile required compiler pass src/{src_file} - Exit status: {s}");
-                        } else {
-                            println!("cargo:warning=Skipping non-required compiler pass src/{src_file} - Reason: Exit status {s}. You can ignore this error.");
-                        }
-                    }
-                }
-                Err(err) => {
+        Some(res) => match res {
+            Ok(s) => {
+                if !s.success() {
                     if required {
                         panic!("Failed to compile required compiler pass src/{src_file} - Exit status: {s}");
                     } else {
-                        println!("cargo:warning=Skipping non-required compiler pass src/{src_file} - Reason: Exit status {s}. You can ignore this error.");
+                        println!("cargo:warning=Skipping non-required compiler pass src/{src_file} - Reason: Exit status {s}. You can ignore this error unless you want this compiler pass.");
                     }
                 }
             }
-        }
+            Err(err) => {
+                if required {
+                    panic!("Failed to compile required compiler pass src/{src_file} - Exit status: {err}");
+                } else {
+                    println!("cargo:warning=Skipping non-required compiler pass src/{src_file} - Reason: Exit status {err}. You can ignore this error unless you want this compiler pass.");
+                }
+            }
+        },
         None => {
             println!("cargo:warning=Skipping compiler pass src/{src_file} - Only supported on Windows or *nix.");
         }