From 1af7b204bc28c25578be4c76614057b2b0b06c2f Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Fri, 11 Dec 2020 01:08:26 +0100
Subject: [PATCH] no_std again

---
 afl/src/events/mod.rs    | 4 ++++
 afl/src/feedbacks/mod.rs | 6 ++++--
 afl/src/inputs/mod.rs    | 1 +
 afl/src/lib.rs           | 2 +-
 afl/src/observers/mod.rs | 5 +++--
 afl/src/serde_anymap.rs  | 1 +
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/afl/src/events/mod.rs b/afl/src/events/mod.rs
index 7615434cbb..3ed12b694e 100644
--- a/afl/src/events/mod.rs
+++ b/afl/src/events/mod.rs
@@ -352,10 +352,14 @@ where
     phantom: PhantomData<(C, E, I, R)>,
 }
 
+#[cfg(feature = "std")]
 /// Forward this to the client
 const LLMP_TAG_EVENT_TO_CLIENT: llmp::Tag = 0x2C11E471;
+#[cfg(feature = "std")]
 /// Only handle this in the broker
 const LLMP_TAG_EVENT_TO_BROKER: llmp::Tag = 0x2B80438;
+#[cfg(feature = "std")]
+/// Handle in both
 const LLMP_TAG_EVENT_TO_BOTH: llmp::Tag = 0x2B0741;
 
 /// Eventmanager for multi-processed application
diff --git a/afl/src/feedbacks/mod.rs b/afl/src/feedbacks/mod.rs
index a0e5d9f9d1..a148ccda16 100644
--- a/afl/src/feedbacks/mod.rs
+++ b/afl/src/feedbacks/mod.rs
@@ -1,3 +1,5 @@
+use alloc::string::String;
+use alloc::string::ToString;
 use alloc::vec::Vec;
 use core::marker::PhantomData;
 use num::Integer;
@@ -153,7 +155,7 @@ where
     pub fn new_with_observer(map_observer: &O) -> Self {
         Self {
             history_map: vec![T::default(); map_observer.map().len()],
-            name: map_observer.name().into(),
+            name: map_observer.name().to_string(),
             phantom: PhantomData,
         }
     }
@@ -170,7 +172,7 @@ where
     pub fn with_history_map(name: &'static str, history_map: Vec<T>) -> Self {
         Self {
             history_map: history_map,
-            name: name.to_string(),
+            name: name.into(),
             phantom: PhantomData,
         }
     }
diff --git a/afl/src/inputs/mod.rs b/afl/src/inputs/mod.rs
index 7601d3420e..d46aecad22 100644
--- a/afl/src/inputs/mod.rs
+++ b/afl/src/inputs/mod.rs
@@ -3,6 +3,7 @@ pub use bytes::BytesInput;
 
 use alloc::vec::Vec;
 use core::clone::Clone;
+#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "std")]
diff --git a/afl/src/lib.rs b/afl/src/lib.rs
index d8b7a62818..4af4633494 100644
--- a/afl/src/lib.rs
+++ b/afl/src/lib.rs
@@ -72,7 +72,7 @@ impl fmt::Display for AflError {
 /// Stringify the postcard serializer error
 impl From<postcard::Error> for AflError {
     fn from(err: postcard::Error) -> Self {
-        Self::Serialize(err.to_string())
+        Self::Serialize(format!("{:?}", err))
     }
 }
 
diff --git a/afl/src/observers/mod.rs b/afl/src/observers/mod.rs
index 9acb5e68e3..e4ab5b8f1b 100644
--- a/afl/src/observers/mod.rs
+++ b/afl/src/observers/mod.rs
@@ -1,6 +1,7 @@
 extern crate num;
 
 use alloc::boxed::Box;
+use alloc::string::String;
 use core::any::Any;
 use serde::{Deserialize, Serialize};
 
@@ -133,7 +134,7 @@ where
         Self {
             map: ArrayMut::Cptr((map.as_mut_ptr(), map.len())),
             initial: initial,
-            name: name.to_string(),
+            name: name.into(),
         }
     }
 
@@ -145,7 +146,7 @@ where
             StdMapObserver {
                 map: ArrayMut::Cptr((map_ptr, len)),
                 initial: initial,
-                name: name.to_string(),
+                name: name.into(),
             }
         }
     }
diff --git a/afl/src/serde_anymap.rs b/afl/src/serde_anymap.rs
index 6b76508218..521dac36bf 100644
--- a/afl/src/serde_anymap.rs
+++ b/afl/src/serde_anymap.rs
@@ -61,6 +61,7 @@ macro_rules! create_serde_registry_for_trait {
         pub mod $mod_name {
 
             use alloc::boxed::Box;
+            use alloc::string::String;
             use core::any::{Any, TypeId};
             use core::fmt;
             use serde::{Deserialize, Serialize};