moved llmp out of events

afl/examples/llmp_test/main.rs

@@ -6,10 +6,7 @@ extern crate alloc;
 use core::{convert::TryInto, time::Duration};
 use std::{thread, time};
 
-use afl::{
+use afl::{llmp, shmem::AflShmem, AflError};
-    events::{llmp, shmem::AflShmem},
-    AflError,
-};
 
 const TAG_SIMPLE_U32_V1: u32 = 0x51300321;
 const TAG_MATH_RESULT_V1: u32 = 0x77474331;

afl/src/events/mod.rs

@@ -1,6 +1,3 @@
-pub mod llmp;
-pub mod shmem;
-
 use alloc::{
     string::{String, ToString},
     vec::Vec,
@@ -11,22 +8,20 @@ use core::{
 };
 use serde::{Deserialize, Serialize};
 
-use self::{
+#[cfg(feature = "std")]
-    llmp::{LlmpClient, LlmpClientDescription, Tag},
+use crate::shmem::AflShmem;
-    shmem::ShMem,
-};
 use crate::{
     corpus::Corpus,
     engines::State,
     feedbacks::FeedbacksTuple,
     inputs::Input,
+    llmp::{self, LlmpClient, LlmpClientDescription, Tag},
     observers::ObserversTuple,
     serde_anymap::Ptr,
+    shmem::ShMem,
     utils::{current_time, Rand},
     AflError,
 };
-#[cfg(feature = "std")]
-use shmem::AflShmem;
 
 #[derive(Debug, Copy, Clone)]
 /// Indicate if an event worked or not

afl/src/lib.rs

@@ -16,10 +16,12 @@ pub mod executors;
 pub mod feedbacks;
 pub mod generators;
 pub mod inputs;
+pub mod llmp;
 pub mod metamap;
 pub mod mutators;
 pub mod observers;
 pub mod serde_anymap;
+pub mod shmem;
 pub mod stages;
 pub mod tuples;
 pub mod utils;

afl/src/llmp.rs

@@ -1609,7 +1609,7 @@ mod tests {
         Tag,
     };
     #[cfg(feature = "std")]
-    use crate::events::shmem::AflShmem;
+    use crate::shmem::AflShmem;
 
     #[cfg(feature = "std")]
     #[test]

afl/src/utils.rs

@@ -11,9 +11,10 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use crate::{
     corpus::Corpus,
     engines::State,
-    events::{shmem::ShMem, LlmpEventManager, Stats},
+    events::{LlmpEventManager, Stats},
     feedbacks::FeedbacksTuple,
     inputs::Input,
+    shmem::ShMem,
     AflError,
 };