Fix Clippy (#2913)

* clp

* lol

* this is false positive

* a

* clippy all

* aa

Author: tokatoka

Cargo.toml

@@ -25,8 +25,8 @@ members = [
   "utils/gramatron/construct_automata",
   "utils/libafl_benches",
   "utils/libafl_jumper",
-  "bindings/pylibafl",
 ]
+
 default-members = [
   "libafl",
   "libafl_bolts",
@@ -36,6 +36,7 @@ default-members = [
 ]
 
 exclude = [
+  "bindings/pylibafl",
   "fuzzers",
   "libafl_libfuzzer_runtime",
   "utils/noaslr",

bindings/pylibafl/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 categories = ["development-tools::testing", "emulators", "embedded", "os"]
 
 [dependencies]
-pyo3 = { workspace = true, features = ["extension-module"] }
+pyo3 = { version = "0.23.2", features = ["extension-module"] }
 pyo3-log = { version = "0.12.0" }
 libafl_sugar = { path = "../../libafl_sugar", version = "0.15.0", features = [
   "python",
@@ -24,7 +24,7 @@ libafl_qemu = { path = "../../libafl_qemu", version = "0.15.0", features = [
 ] }
 
 [build-dependencies]
-pyo3-build-config = { workspace = true }
+pyo3-build-config = "0.23.2"
 
 [lib]
 name = "pylibafl"

fuzzers/forkserver/libafl-fuzz/src/env_parser.rs

@@ -40,7 +40,7 @@ pub fn parse_envs(opt: &mut Opt) -> Result<(), Error> {
     if let Ok(res) = std::env::var("AFL_MAP_SIZE") {
         let map_size = validate_map_size(res.parse()?)?;
         opt.map_size = Some(map_size);
-    };
+    }
     if let Ok(res) = std::env::var("AFL_IGNORE_TIMEOUT") {
         opt.ignore_timeouts = parse_bool(&res)?;
     }

fuzzers/forkserver/libafl-fuzz/src/fuzzer.rs

@@ -363,7 +363,7 @@ define_run_client!(state, mgr, fuzzer_dir, core_id, opt, is_main_node, {
         // Enable autodict if configured
         if !opt.no_autodict {
             executor_builder = executor_builder.autotokens(&mut tokens);
-        };
+        }
 
         // Finalize and build our Executor
         SupportedExecutors::Forkserver(

fuzzers/forkserver/libafl-fuzz/src/main.rs

@@ -199,7 +199,7 @@ fn main() {
         Ok(()) => unreachable!(),
         Err(Error::ShuttingDown) => println!("Fuzzing stopped by user. Good bye."),
         Err(err) => panic!("Failed to run launcher: {err:?}"),
-    };
+    }
 }
 
 #[expect(clippy::struct_excessive_bools)]

libafl/src/common/nautilus/grammartec/tree.rs

@@ -57,7 +57,7 @@ impl<'data, 'tree: 'data, 'ctx: 'data, W: Write, T: TreeLike> Unparser<'data, 't
             Some(UnparseStep::Script(num, expr)) => self.unwrap_script(num, &expr),
             Some(UnparseStep::PushBuffer()) => self.push_buffer(),
             None => return false,
-        };
+        }
         true
     }
 

libafl/src/corpus/inmemory_ondisk.rs

@@ -486,7 +486,7 @@ mod tests {
             Ok(None) => (),
             Ok(_) => panic!("File {path:?} did not exist even though it should have?"),
             Err(e) => panic!("An unexpected error occurred: {e}"),
-        };
+        }
         drop(f);
         fs::remove_file(path).unwrap();
     }

libafl/src/events/launcher.rs

@@ -330,7 +330,7 @@ where
                                 client_description,
                             );
                         }
-                    };
+                    }
                 }
             }
         }
@@ -829,7 +829,7 @@ where
                                 Err(Error::shutting_down())
                             }
                         }?,
-                    };
+                    }
                 }
             }
         }
@@ -902,7 +902,7 @@ where
             if let Some(remote_broker_addr) = self.remote_broker_addr {
                 log::info!("B2b: Connecting to {:?}", &remote_broker_addr);
                 broker.inner_mut().connect_b2b(remote_broker_addr)?;
-            };
+            }
 
             broker.set_exit_after(exit_cleanly_after);
 

libafl/src/events/llmp/restarting.rs

@@ -831,7 +831,7 @@ where
                 if let Some(remote_broker_addr) = remote_broker_addr {
                     log::info!("B2b: Connecting to {:?}", &remote_broker_addr);
                     broker.inner_mut().connect_b2b(remote_broker_addr)?;
-                };
+                }
 
                 if let Some(exit_cleanly_after) = self.exit_cleanly_after {
                     broker.set_exit_after(exit_cleanly_after);

libafl/src/events/mod.rs

@@ -901,6 +901,6 @@ mod tests {
                 assert_eq!("test", o.0.name());
             }
             _ => panic!("mistmatch"),
-        };
+        }
     }
 }