From 33654dbf0493badf4f3e398a331ca1eaa91dfb45 Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Mon, 22 Mar 2021 15:09:47 +0100
Subject: [PATCH] fixed no_std

---
 libafl/src/bolts/llmp.rs               | 4 ++--
 libafl/src/fuzzer.rs                   | 4 ++--
 libafl/src/mutators/token_mutations.rs | 1 +
 libafl/src/observers/map.rs            | 5 ++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libafl/src/bolts/llmp.rs b/libafl/src/bolts/llmp.rs
index 054bc2c3c9..f49f78a635 100644
--- a/libafl/src/bolts/llmp.rs
+++ b/libafl/src/bolts/llmp.rs
@@ -89,10 +89,10 @@ use std::{
     },
 };
 
-#[cfg(all(feature = "std", unix))]
+#[cfg(all(unix, feature = "std"))]
 use libc::c_char;
 
-#[cfg(unix)]
+#[cfg(all(unix, feature = "std"))]
 use uds::{UnixListenerExt, UnixSocketAddr, UnixStreamExt};
 
 #[cfg(unix)]
diff --git a/libafl/src/fuzzer.rs b/libafl/src/fuzzer.rs
index d1c34324c1..2bddff0b5a 100644
--- a/libafl/src/fuzzer.rs
+++ b/libafl/src/fuzzer.rs
@@ -10,8 +10,8 @@ use crate::{
     Error,
 };
 
+use alloc::string::ToString;
 use core::{marker::PhantomData, time::Duration};
-use std::ops::Sub;
 
 /// Send a stats update all 6 (or more) seconds
 const STATS_TIMEOUT_DEFAULT: Duration = Duration::from_millis(6 * 1000);
@@ -161,7 +161,7 @@ where
         stats_timeout: Duration,
     ) -> Result<Duration, Error> {
         let cur = current_time();
-        if cur.sub(last) > stats_timeout {
+        if cur - last > stats_timeout {
             //println!("Fire {:?} {:?} {:?}", cur, last, stats_timeout);
             manager.fire(
                 state,
diff --git a/libafl/src/mutators/token_mutations.rs b/libafl/src/mutators/token_mutations.rs
index 90741b2f97..715bac7f35 100644
--- a/libafl/src/mutators/token_mutations.rs
+++ b/libafl/src/mutators/token_mutations.rs
@@ -206,6 +206,7 @@ mod tests {
     #[cfg(feature = "std")]
     use std::fs;
 
+    #[cfg(feature = "std")]
     use super::Tokens;
 
     #[cfg(feature = "std")]
diff --git a/libafl/src/observers/map.rs b/libafl/src/observers/map.rs
index 825a62b8b9..85d5d2d6be 100644
--- a/libafl/src/observers/map.rs
+++ b/libafl/src/observers/map.rs
@@ -1,4 +1,7 @@
-use alloc::string::{String, ToString};
+use alloc::{
+    string::{String, ToString},
+    vec::Vec,
+};
 use serde::{Deserialize, Serialize};
 
 use crate::{