From f990d9dcc5cf5763234a011a16dd6bfeae7eec07 Mon Sep 17 00:00:00 2001
From: Addison Crump <addison.crump@cispa.de>
Date: Wed, 7 Jun 2023 19:56:37 +0200
Subject: [PATCH] Remove libafl_libfuzzer while it remains unstable (#4933)

---
 fuzz/Cargo.lock                             | 11 -----------
 fuzz/Cargo.toml                             |  3 ---
 fuzz/fuzz_targets/ruff_fix_validity.rs      |  3 ---
 fuzz/fuzz_targets/ruff_parse_idempotency.rs |  3 ---
 fuzz/fuzz_targets/ruff_parse_simple.rs      |  3 ---
 5 files changed, 23 deletions(-)

diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index 43cfb1a9c39714..819b714fc24797 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -628,16 +628,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "libafl_libfuzzer"
-version = "0.10.1"
-source = "git+https://github.com/AFLplusplus/LibAFL.git?branch=libfuzzer#ce0be4066016a40f92f1202621bbce93274655ce"
-dependencies = [
- "cc",
- "libfuzzer-sys",
- "rustversion",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.146"
@@ -1101,7 +1091,6 @@ name = "ruff-fuzz"
 version = "0.0.0"
 dependencies = [
  "arbitrary",
- "libafl_libfuzzer",
  "libfuzzer-sys",
  "ruff",
  "ruff_python_ast",
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 25ad036a6f9ce7..2e00df59388228 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -11,8 +11,6 @@ edition = "2021"
 [features]
 default = ["libfuzzer"]
 full-idempotency = []
-libafl = ["libafl_libfuzzer"]
-libafl_merge = ["libafl", "libafl_libfuzzer/merge"]
 libfuzzer = ["libfuzzer-sys/link_libfuzzer"]
 
 [package.metadata]
@@ -20,7 +18,6 @@ cargo-fuzz = true
 
 [dependencies]
 arbitrary = { version = "1.3.0", features = ["derive"] }
-libafl_libfuzzer = { git = "https://github.com/AFLplusplus/LibAFL.git", branch = "libfuzzer", optional = true }
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false }
 ruff = { path = "../crates/ruff" }
 ruff_python_ast = { path = "../crates/ruff_python_ast" }
diff --git a/fuzz/fuzz_targets/ruff_fix_validity.rs b/fuzz/fuzz_targets/ruff_fix_validity.rs
index d21959ef009419..7f70cd1b12930d 100644
--- a/fuzz/fuzz_targets/ruff_fix_validity.rs
+++ b/fuzz/fuzz_targets/ruff_fix_validity.rs
@@ -3,9 +3,6 @@
 
 #![no_main]
 
-#[cfg(feature = "libafl")]
-extern crate libafl_libfuzzer;
-
 use libfuzzer_sys::{fuzz_target, Corpus};
 use ruff::settings::Settings;
 use std::sync::OnceLock;
diff --git a/fuzz/fuzz_targets/ruff_parse_idempotency.rs b/fuzz/fuzz_targets/ruff_parse_idempotency.rs
index c09eee16c073b6..ac4387e3b43eaf 100644
--- a/fuzz/fuzz_targets/ruff_parse_idempotency.rs
+++ b/fuzz/fuzz_targets/ruff_parse_idempotency.rs
@@ -3,9 +3,6 @@
 
 #![no_main]
 
-#[cfg(feature = "libafl")]
-extern crate libafl_libfuzzer;
-
 use libfuzzer_sys::{fuzz_target, Corpus};
 use ruff_python_ast::source_code::round_trip;
 use similar::TextDiff;
diff --git a/fuzz/fuzz_targets/ruff_parse_simple.rs b/fuzz/fuzz_targets/ruff_parse_simple.rs
index 117ff38f12119c..e685f738575246 100644
--- a/fuzz/fuzz_targets/ruff_parse_simple.rs
+++ b/fuzz/fuzz_targets/ruff_parse_simple.rs
@@ -3,9 +3,6 @@
 
 #![no_main]
 
-#[cfg(feature = "libafl")]
-extern crate libafl_libfuzzer;
-
 use libfuzzer_sys::{fuzz_target, Corpus};
 use ruff_python_ast::source_code::round_trip;