Use edition 2024

Author: smoelius

afl/Cargo.toml

@@ -10,7 +10,7 @@ authors = [
 description = "Fuzzing Rust code with american-fuzzy-lop"
 repository = "https://github.com/rust-fuzz/afl.rs"
 homepage = "https://github.com/rust-fuzz/afl.rs"
-edition = "2021"
+edition = "2024"
 exclude = ["etc"]
 
 [build-dependencies]

afl/src/lib.rs

@@ -10,7 +10,7 @@ use std::io::{self, Read};
 use std::panic;
 
 // those functions are provided by the afl-llvm-rt static library
-extern "C" {
+unsafe extern "C" {
     fn __afl_persistent_loop(counter: usize) -> isize;
     fn __afl_manual_init();
 
@@ -20,7 +20,7 @@ extern "C" {
 
 #[allow(non_upper_case_globals)]
 #[doc(hidden)]
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub static mut __afl_sharedmem_fuzzing: i32 = 1;
 
 /// Fuzz a closure by passing it a `&[u8]`

cargo-afl/Cargo.toml

@@ -11,7 +11,7 @@ authors = [
 description = "Fuzzing Rust code with american-fuzzy-lop"
 repository = "https://github.com/rust-fuzz/afl.rs"
 homepage = "https://github.com/rust-fuzz/afl.rs"
-edition = "2021"
+edition = "2024"
 exclude = ["etc"]
 
 [build-dependencies]

cargo-afl/build.rs

@@ -16,17 +16,18 @@ fn main() {
     let building_on_docs_rs = env::var("DOCS_RS").is_ok();
 
     // smoelius: Build AFLplusplus only when installing and not building on docs.rs.
-    if installing && !building_on_docs_rs {
-        if let Err(error) = config::config(&config::Args {
+    if installing
+        && !building_on_docs_rs
+        && let Err(error) = config::config(&config::Args {
             build: true,
             force: true,
             plugins: cfg!(feature = "plugins"),
             ..Default::default()
-        }) {
-            println!(
-                "cargo:warn=Could not build AFLplusplus; it will need to be built manually with \
+        })
+    {
+        println!(
+            "cargo:warn=Could not build AFLplusplus; it will need to be built manually with \
                  `cargo afl config --build`: {error}"
-            );
-        }
+        );
     }
 }

cargo-afl/src/main.rs

@@ -333,7 +333,9 @@ where
     if no_cfg_fuzzing {
         rustflags.push_str("--cfg no_fuzzing ");
         // afl-fuzz is sensitive to AFL_ env variables. Let's remove this particular one - it did it's job
-        env::remove_var("AFL_NO_CFG_FUZZING");
+        unsafe {
+            env::remove_var("AFL_NO_CFG_FUZZING");
+        }
     } else {
         rustflags.push_str("--cfg fuzzing ");
     }

cargo-afl/tests/crates_io.rs

@@ -10,7 +10,9 @@ const BUILD_MSGS: &[&str] = &[
 
 #[ctor::ctor]
 fn init() {
-    env::set_var("CARGO_TERM_COLOR", "never");
+    unsafe {
+        env::set_var("CARGO_TERM_COLOR", "never");
+    }
 }
 
 #[test]