switched to typed_builder

Author: domenukk

libafl/Cargo.toml

@@ -37,7 +37,7 @@ harness = false
 
 [features]
 default = ["std", "anymap_debug", "derive", "llmp_compression"]
-std = ["derive_builder"] # print, sharedmap, ... support
+std = [] # print, env, launcher ... support
 anymap_debug = ["serde_json"] # uses serde_json to Debug the anymap trait. Disable for smaller footprint.
 derive = ["libafl_derive"] # provide derive(SerdeAny) macro.
 llmp_small_maps = [] # reduces initial map size for llmp
@@ -66,7 +66,7 @@ compression = { version = "0.1.5" }
 core_affinity = { version = "0.5", git = "https://github.com/s1341/core_affinity_rs" }
 num_enum = "0.5.1"
 hostname = "^0.3" # Is there really no gethostname in the stdlib?
-derive_builder = { version="0.10", optional = true }
+typed-builder = "0.9.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
 backtrace = { version = "0.3", optional = true, default-features = false, features = ["std", "libbacktrace"] } # for llmp_debug

libafl/src/events/llmp.rs

@@ -48,8 +48,7 @@ use crate::utils::{fork, ForkResult};
 #[cfg(all(target_os = "android", feature = "std"))]
 use crate::bolts::os::ashmem_server::AshmemService;
 
-#[cfg(feature = "std")]
-use derive_builder::Builder;
+use typed_builder::TypedBuilder;
 
 /// Forward this to the client
 const _LLMP_TAG_EVENT_TO_CLIENT: llmp::Tag = 0x2C11E471;
@@ -580,12 +579,11 @@ where
     #[cfg(target_os = "android")]
     AshmemService::start().expect("Error starting Ashmem Service");
 
-    RestartingMgrBuilder::default()
+    RestartingMgr::builder()
         .shmem_provider(StdShMemProvider::new()?)
         .stats(stats)
         .broker_port(broker_port)
         .build()
-        .unwrap()
         .launch()
 }
 
@@ -594,8 +592,7 @@ where
 /// `restarter` will start a new process each time the child crashes or times out.
 #[cfg(feature = "std")]
 #[allow(clippy::default_trait_access)]
-#[derive(Builder, Debug)]
-#[builder(pattern = "owned")]
+#[derive(TypedBuilder, Debug)]
 pub struct RestartingMgr<I, S, SP, ST>
 where
     I: Input,
@@ -609,15 +606,15 @@ where
     /// The stats to use
     stats: ST,
     /// The broker port to use
-    #[builder(default = "1337")]
+    #[builder(default = 1337_u16)]
     broker_port: u16,
     /// The address to connect to
-    #[builder(default = "Option::None")]
+    #[builder(default = None)]
     remote_broker_addr: Option<SocketAddr>,
     /// The type of manager to build
-    #[builder(default = "ManagerKind::Any")]
+    #[builder(default = ManagerKind::Any)]
     kind: ManagerKind,
-    #[builder(setter(skip))]
+    #[builder(setter(skip), default = PhantomData {})]
     _phantom: PhantomData<(I, S)>,
 }
 

libafl/src/utils.rs

@@ -18,7 +18,7 @@ use xxhash_rust::xxh3::xxh3_64_with_seed;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 #[cfg(feature = "std")]
-use crate::events::llmp::RestartingMgrBuilder;
+use crate::events::llmp::RestartingMgr;
 
 #[cfg(unix)]
 use libc::pid_t;
@@ -40,8 +40,7 @@ use core_affinity::CoreId;
 #[cfg(all(windows, feature = "std"))]
 use std::process::Stdio;
 
-#[cfg(feature = "std")]
-use derive_builder::Builder;
+use typed_builder::TypedBuilder;
 
 /// Can be converted to a slice
 pub trait AsSlice<T> {
@@ -601,9 +600,8 @@ mod tests {
 
 /// Provides a Launcher, which can be used to launch a fuzzing run on a specified list of cores
 #[cfg(feature = "std")]
-#[derive(Builder)]
+#[derive(TypedBuilder)]
 #[allow(clippy::type_complexity)]
-#[builder(pattern = "owned")]
 pub struct Launcher<'a, I, S, SP, ST>
 where
     I: Input,
@@ -621,16 +619,16 @@ where
     run_client:
         &'a mut dyn FnMut(Option<S>, LlmpRestartingEventManager<I, S, SP, ST>) -> Result<(), Error>,
     /// The broker port to use
-    #[builder(default = "1337")]
+    #[builder(default = 1337_u16)]
     broker_port: u16,
     /// The list of cores to run on
     cores: &'a [usize],
     /// A file name to write all client output to
-    #[builder(default = "None")]
+    #[builder(default = None)]
     stdout_file: Option<&'a str>,
     /// The `ip:port` address of another broker to connect our new broker to for multi-machine
     /// clusters.
-    #[builder(default = "None")]
+    #[builder(default = None)]
     remote_broker_addr: Option<SocketAddr>,
 }
 
@@ -679,15 +677,14 @@ where
                         }
                         //fuzzer client. keeps retrying the connection to broker till the broker starts
                         let stats = (self.client_init_stats)()?;
-                        let (state, mgr) = RestartingMgrBuilder::default()
+                        let (state, mgr) = RestartingMgr::builder()
                             .shmem_provider(self.shmem_provider.clone())
                             .stats(stats)
                             .broker_port(self.broker_port)
                             .kind(ManagerKind::Client {
                                 cpu_core: Some(*bind_to),
                             })
                             .build()
-                            .unwrap()
                             .launch()?;
 
                         (self.run_client)(state, mgr)?;
@@ -699,14 +696,13 @@ where
         #[cfg(feature = "std")]
         println!("I am broker!!.");
 
-        RestartingMgrBuilder::<I, S, SP, ST>::default()
+        RestartingMgr::<I, S, SP, ST>::builder()
             .shmem_provider(self.shmem_provider.clone())
             .stats(self.stats.clone())
             .broker_port(self.broker_port)
             .kind(ManagerKind::Broker)
             .remote_broker_addr(self.remote_broker_addr)
             .build()
-            .unwrap()
             .launch()?;
 
         //broker exited. kill all clients.
@@ -731,7 +727,7 @@ where
 
                 // the actual client. do the fuzzing
                 let stats = (self.client_init_stats)()?;
-                let (state, mgr) = RestartingMgrBuilder::<I, S, SP, ST>::default()
+                let (state, mgr) = RestartingMgr::<I, S, SP, ST>::builder()
                     .shmem_provider(self.shmem_provider.clone())
                     .stats(stats)
                     .broker_port(self.broker_port)
@@ -789,7 +785,7 @@ where
         #[cfg(feature = "std")]
         println!("I am broker!!.");
 
-        RestartingMgrBuilder::<I, S, SP, ST>::default()
+        RestartingMgr::<I, S, SP, ST>::builder()
             .shmem_provider(self.shmem_provider.clone())
             .stats(self.stats.clone())
             .broker_port(self.broker_port)