Merge pull request #19 from epi052/move-reset-to-fuzzer-trait

Move reset to fuzzer trait

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "feroxfuzz"
-version = "1.0.0-rc.6"
+version = "1.0.0-rc.7"
 edition = "2021"
 authors = ["Ben 'epi' Risher (@epi052)"]
 license = "Apache-2.0"

src/client/utils.rs

@@ -17,7 +17,7 @@ pub(super) fn parse_version(data: &Data) -> Result<Version, FeroxFuzzError> {
             error!(%data, "failed to parse http version; must be a valid http version when using a reqwest client");
 
             Err(FeroxFuzzError::InvalidVersionError {
-                version: format!("{}", data),
+                version: format!("{data}"),
             })
         }
     }

src/corpora/mod.rs

@@ -67,6 +67,22 @@ pub enum CorpusItemType {
     ///
     /// [`Data`]: crate::input::Data
     Data(Data),
+
+    /// When the corpus item type is [`CorpusItemType::LotsOfData`], all [`Data`]
+    /// values associated with the key will be added to the corpus.
+    ///
+    /// # Note
+    ///
+    /// There are a lot of [`From`] implementations for [`Data`]. When creating
+    /// a [`CorpusItemType::Data`] item, you can probably just use `.into`:
+    ///
+    /// ```
+    /// # use feroxfuzz::corpora::CorpusItemType;
+    /// CorpusItemType::LotsOfData(vec!["something".into()]);
+    /// ```
+    ///
+    /// [`Data`]: crate::input::Data
+    LotsOfData(Vec<Data>),
 }
 
 /// Collection of all current test cases
@@ -87,7 +103,7 @@ pub trait Corpus: Named {
 /// most of the methods/traits implemented by the underlying [`Corpus`] types
 /// are implemented here as well. Meaning, you should be able to use the
 /// underlying [`Corpus`] types seamlessly through this wrapper.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[non_exhaustive]
 pub enum CorpusType {
@@ -257,10 +273,14 @@ mod typestate {
     pub trait CorpusBuildState {}
     pub struct NoItems;
     pub struct NoName;
+    pub struct NotUnique;
     pub struct HasItems;
     pub struct HasName;
+    pub struct Unique;
     impl CorpusBuildState for NoItems {}
     impl CorpusBuildState for NoName {}
+    impl CorpusBuildState for NotUnique {}
     impl CorpusBuildState for HasItems {}
     impl CorpusBuildState for HasName {}
+    impl CorpusBuildState for Unique {}
 }