From 5aa2202d048338a2839f6b047fc703b953126ef7 Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Fri, 8 Jan 2021 23:41:25 +0100
Subject: [PATCH] simplify mutator calls

---
 afl/src/corpus/mod.rs         | 11 ++++++-----
 afl/src/mutators/mutations.rs |  9 +++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/afl/src/corpus/mod.rs b/afl/src/corpus/mod.rs
index 7afc731787..85aa9dc0d1 100644
--- a/afl/src/corpus/mod.rs
+++ b/afl/src/corpus/mod.rs
@@ -378,14 +378,15 @@ where
 #[cfg(test)]
 #[cfg(feature = "std")]
 mod tests {
-    use crate::corpus::Corpus;
-    use crate::corpus::Testcase;
-    use crate::corpus::{OnDiskCorpus, QueueCorpus};
-    use crate::inputs::bytes::BytesInput;
-    use crate::utils::StdRand;
 
     use std::path::PathBuf;
 
+    use crate::{
+        corpus::{Corpus, OnDiskCorpus, QueueCorpus, Testcase},
+        inputs::bytes::BytesInput,
+        utils::StdRand,
+    };
+
     #[test]
     fn test_queuecorpus() {
         let mut rand = StdRand::new(0);
diff --git a/afl/src/mutators/mutations.rs b/afl/src/mutators/mutations.rs
index 80999bc6bb..4113c55400 100644
--- a/afl/src/mutators/mutations.rs
+++ b/afl/src/mutators/mutations.rs
@@ -460,8 +460,7 @@ pub fn mutation_bytesexpand<M, C, I, R>(
     input: &mut I,
 ) -> Result<MutationResult, AflError>
 where
-    M: Mutator<C, I, R> + HasMaxSize,
-    C: Corpus<I, R>,
+    M: HasMaxSize,
     I: Input + HasBytesVec,
     R: Rand,
 {
@@ -485,8 +484,7 @@ pub fn mutation_bytesinsert<M, C, I, R>(
     input: &mut I,
 ) -> Result<MutationResult, AflError>
 where
-    M: Mutator<C, I, R> + HasMaxSize,
-    C: Corpus<I, R>,
+    M: HasMaxSize,
     I: Input + HasBytesVec,
     R: Rand,
 {
@@ -512,8 +510,7 @@ pub fn mutation_bytesrandinsert<M, C, I, R>(
     input: &mut I,
 ) -> Result<MutationResult, AflError>
 where
-    M: Mutator<C, I, R> + HasMaxSize,
-    C: Corpus<I, R>,
+    M: HasMaxSize,
     I: Input + HasBytesVec,
     R: Rand,
 {