Clippy+fmt

Author: mkravchik

fuzzers/frida_gdiplus/src/fuzzer.rs

@@ -424,9 +424,7 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                     // New maximization map feedback linked to the reaches observer
                     // TODO - check whether I need to track novelties as well
                     // MaxMapFeedback::tracking(&reachability_observer, true, true),
-                    ReachabilityFeedback::new(
-                        &reachability_observer_meta
-                    ),
+                    ReachabilityFeedback::new(&reachability_observer_meta),
                     NewHashFeedbackWithStack::new(&bt_observer),
                     CrashFeedback::new(),
                     TimeoutFeedback::new()

fuzzers/toolbox/src/accum_observer.rs

@@ -1,10 +1,9 @@
 use alloc::borrow::Cow;
-
 #[cfg(unix)]
 use std::fs;
 use std::{
     collections::HashMap,
-    hash::{BuildHasher, Hasher},
+    hash::{BuildHasher, Hash, Hasher},
     path::PathBuf,
 };
 
@@ -24,7 +23,6 @@ use libafl_targets::{
 };
 use rangemap::RangeMap;
 use serde::{Deserialize, Serialize};
-use std::hash::Hash;
 /// Map observer that accumulates hitcounts and saves them in DrCov format.
 ///
 #[derive(Serialize, Deserialize, Clone, Debug)]

fuzzers/toolbox/src/crash_stack.rs

@@ -12,8 +12,11 @@ use libafl::{
     observers::{BacktraceObserver, HarnessType, Observer, ObserverWithHashField, ObserversTuple},
     state::State,
 };
-use libafl_bolts::{impl_serdeany, Error, Named, 
-    tuples::{Handle, MatchNameRef}};
+use libafl_bolts::{
+    impl_serdeany,
+    tuples::{Handle, MatchNameRef},
+    Error, Named,
+};
 use log::{info, warn};
 use serde::{
     // Serializer,
@@ -285,7 +288,7 @@ impl<'a> BacktraceObserverWithStack<'a> {
         backtrace_hash: &'a mut Option<u64>,
         harness_type: HarnessType,
         with_symbols: bool,
-    ) -> Self 
+    ) -> Self
     where
         S: Into<Cow<'static, str>>,
     {
@@ -423,7 +426,6 @@ where
             .get(&self.0.observer_handle())
             .expect("A NewHashFeedbackWithStack needs a BacktraceObserverWithStack");
 
-        
         match observer.get_backtrace() {
             // Performance problem here!
             Some(b) => testcase.add_metadata(BacktraceMetadata::new(b.clone())),
@@ -451,8 +453,7 @@ impl<'a, S> HasObserverHandle for NewHashFeedbackWithStack<'a, S> {
     }
 }
 
-impl<'a, S> NewHashFeedbackWithStack<'a, S>
-{
+impl<'a, S> NewHashFeedbackWithStack<'a, S> {
     /// Returns a new [`NewHashFeedbackWithStack`].
     #[must_use]
     pub fn new(observer: &BacktraceObserverWithStack<'a>) -> Self {

fuzzers/toolbox/src/lib.rs

@@ -3,4 +3,3 @@ pub mod crash_stack;
 pub mod reachability_rt;
 #[doc(hidden)]
 pub extern crate alloc;
-

fuzzers/toolbox/src/reachability_rt.rs

@@ -22,7 +22,10 @@ use libafl::{
     // state::HasMetadata,
     // Error,
 };
-use libafl_bolts::{HasLen, Named, tuples::{Handle, Handled, MatchNameRef}};
+use libafl_bolts::{
+    tuples::{Handle, Handled, MatchNameRef},
+    HasLen, Named,
+};
 use libafl_frida::helper::FridaRuntime;
 use rangemap::RangeMap;
 //use std::os::windows::ffi::OsStringExt;
@@ -289,12 +292,9 @@ pub struct ReachabilityObserver {
 impl ReachabilityObserver {
     /// Creates a new [`ReachabilityObserver`] with the given name.
     #[must_use]
-    pub fn new<S>(
-        observer_name: S,
-        map: *mut u8, 
-        hooks_file: Option<&str>) -> Self 
-        where
-            S: Into<Cow<'static, str>> + Clone,
+    pub fn new<S>(observer_name: S, map: *mut u8, hooks_file: Option<&str>) -> Self
+    where
+        S: Into<Cow<'static, str>> + Clone,
     {
         log::info!("ReachabilityObserver created");
         let hooks = match hooks_file {
@@ -312,7 +312,7 @@ impl ReachabilityObserver {
             .enumerate()
             .map(|(idx, hook)| (idx, hook.api_name.clone()))
             .collect();
-        
+
         Self {
             observer_name: observer_name.clone().into(),
             base: unsafe { StdMapObserver::from_mut_ptr(observer_name, map, MAP_SIZE) },
@@ -462,7 +462,6 @@ where
             .get(&self.o_ref)
             .expect("A ReachabilityFeedback needs a ReachabilityObserver");
 
-
         let invocations = observer.get_invocations();
         if !invocations.is_empty() {
             testcase.add_metadata(ReachabilityMetadata::new(invocations.clone()));
@@ -487,8 +486,7 @@ impl HasObserverHandle for ReachabilityFeedback {
     }
 }
 
-impl ReachabilityFeedback
-{
+impl ReachabilityFeedback {
     /// Returns a new [`ReachabilityFeedback`].
     #[must_use]
     pub fn new(observer: &ReachabilityObserver) -> Self {

libafl/src/executors/hooks/windows.rs

@@ -356,20 +356,16 @@ pub mod windows_exception_handler {
                 // as we'll mostly see the transformed blocks and not the original code.
                 #[cfg(feature = "minidump")]
                 {
-                    use std::{
-                        fs::File,
-                        os::windows::io::AsRawHandle,
-                        ptr::null_mut,
-                    };
+                    use std::{fs::File, os::windows::io::AsRawHandle, ptr::null_mut};
 
                     use winapi::{
                         shared::minwindef::{BOOL, DWORD, FALSE},
                         um::{
-                            winnt::HANDLE,
                             processthreadsapi::{
                                 GetCurrentProcess, GetCurrentProcessId, GetCurrentThreadId,
                             },
-                        }
+                            winnt::HANDLE,
+                        },
                     };
 
                     const MINI_DUMP_FULL_MEMORY_INFO: i32 = 0x00000800;

libafl_libfuzzer/libafl_libfuzzer_runtime/src/merge.rs

@@ -236,7 +236,8 @@ pub fn merge(
                     .scheduler_mut()
                     .on_remove(&mut state, idx, &Some(testcase))?;
             } else {
-                #[allow(clippy::needless_borrows_for_generic_args)] // False-positive: file_path is used just below
+                #[allow(clippy::needless_borrows_for_generic_args)]
+                // False-positive: file_path is used just below
                 rename(&file_path, &new_file_path)?;
                 *file_path = new_file_path;
             }