From 4b9cb2cd5815b83119df9534d02db4e6b9150c6e Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Tue, 2 Feb 2021 03:46:46 +0100
Subject: [PATCH] moved llmp out of events

---
 afl/examples/llmp_test/main.rs |  5 +----
 afl/src/events/mod.rs          | 13 ++++---------
 afl/src/lib.rs                 |  2 ++
 afl/src/{events => }/llmp.rs   |  2 +-
 afl/src/{events => }/shmem.rs  |  0
 afl/src/utils.rs               |  3 ++-
 6 files changed, 10 insertions(+), 15 deletions(-)
 rename afl/src/{events => }/llmp.rs (99%)
 rename afl/src/{events => }/shmem.rs (100%)

diff --git a/afl/examples/llmp_test/main.rs b/afl/examples/llmp_test/main.rs
index 5f5bccf3b3..754ff1590e 100644
--- a/afl/examples/llmp_test/main.rs
+++ b/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::{
-    events::{llmp, shmem::AflShmem},
-    AflError,
-};
+use afl::{llmp, shmem::AflShmem, AflError};
 
 const TAG_SIMPLE_U32_V1: u32 = 0x51300321;
 const TAG_MATH_RESULT_V1: u32 = 0x77474331;
diff --git a/afl/src/events/mod.rs b/afl/src/events/mod.rs
index d6fec3c172..0612f77646 100644
--- a/afl/src/events/mod.rs
+++ b/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::{
-    llmp::{LlmpClient, LlmpClientDescription, Tag},
-    shmem::ShMem,
-};
+#[cfg(feature = "std")]
+use crate::shmem::AflShmem;
 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
diff --git a/afl/src/lib.rs b/afl/src/lib.rs
index 92a4c2b6fe..0b501a5bef 100644
--- a/afl/src/lib.rs
+++ b/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;
diff --git a/afl/src/events/llmp.rs b/afl/src/llmp.rs
similarity index 99%
rename from afl/src/events/llmp.rs
rename to afl/src/llmp.rs
index ab470390e2..429e9a9a0c 100644
--- a/afl/src/events/llmp.rs
+++ b/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]
diff --git a/afl/src/events/shmem.rs b/afl/src/shmem.rs
similarity index 100%
rename from afl/src/events/shmem.rs
rename to afl/src/shmem.rs
diff --git a/afl/src/utils.rs b/afl/src/utils.rs
index bcba188d07..6b52037139 100644
--- a/afl/src/utils.rs
+++ b/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,
 };