deps: Bump arbitrary to 1.0; libfuzzer-sys to 0.4

Author: fitzgen

crates/wasm-smith/Cargo.toml

@@ -20,15 +20,15 @@ name = "corpus"
 harness = false
 
 [dependencies]
-arbitrary = { version = "0.4.6", features = ["derive"] }
+arbitrary = { version = "1.0.0", features = ["derive"] }
 leb128 = "0.2.4"
 structopt = { version = "0.3.16", optional = true }
 wasm-encoder = { version = "0.4.0", path = "../wasm-encoder" }
 indexmap = "1.6"
 
 [dev-dependencies]
 criterion = "0.3.3"
-libfuzzer-sys = "0.3.4"
+libfuzzer-sys = "0.4.0"
 rand = { version = "0.7.3", features = ["small_rng"] }
 wasmparser = { path = "../wasmparser" }
 wasmprinter = { path = "../wasmprinter" }

crates/wasm-smith/src/config.rs

@@ -15,7 +15,7 @@ use arbitrary::{Arbitrary, Result, Unstructured};
 /// Every trait method has a provided default implementation, so that you only
 /// need to override the methods for things you want to change away from the
 /// default.
-pub trait Config: Arbitrary + Default + Clone {
+pub trait Config: for<'a> Arbitrary<'a> + Default + Clone {
     /// The minimum number of types to generate. Defaults to 0.
     fn min_types(&self) -> usize {
         0
@@ -309,8 +309,8 @@ pub struct SwarmConfig {
     max_nesting_depth: usize,
 }
 
-impl Arbitrary for SwarmConfig {
-    fn arbitrary(u: &mut Unstructured<'_>) -> Result<Self> {
+impl<'a> Arbitrary<'a> for SwarmConfig {
+    fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
         const MAX_MAXIMUM: usize = 1000;
 
         let reference_types_enabled: bool = u.arbitrary()?;

crates/wasm-smith/src/lib.rs

@@ -204,8 +204,8 @@ impl<C: Config> ConfiguredModule<C> {
     }
 }
 
-impl<C: Config> Arbitrary for ConfiguredModule<C> {
-    fn arbitrary(u: &mut Unstructured) -> Result<Self> {
+impl<'a, C: Config> Arbitrary<'a> for ConfiguredModule<C> {
+    fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
         let mut module = ConfiguredModule::<C>::default();
         module.build(u, false)?;
         Ok(module)
@@ -228,8 +228,8 @@ impl MaybeInvalidModule {
     }
 }
 
-impl Arbitrary for MaybeInvalidModule {
-    fn arbitrary(u: &mut Unstructured) -> Result<Self> {
+impl<'a> Arbitrary<'a> for MaybeInvalidModule {
+    fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
         let mut module = Module::default();
         module.inner.build(u, true)?;
         Ok(MaybeInvalidModule { module })
@@ -1954,12 +1954,12 @@ fn limited_string(max_size: usize, u: &mut Unstructured) -> Result<String> {
     let size = std::cmp::min(size, max_size);
     match str::from_utf8(&u.peek_bytes(size).unwrap()) {
         Ok(s) => {
-            u.get_bytes(size).unwrap();
+            u.bytes(size).unwrap();
             Ok(s.into())
         }
         Err(e) => {
             let i = e.valid_up_to();
-            let valid = u.get_bytes(i).unwrap();
+            let valid = u.bytes(i).unwrap();
             let s = unsafe {
                 debug_assert!(str::from_utf8(valid).is_ok());
                 str::from_utf8_unchecked(valid)
@@ -2029,7 +2029,7 @@ fn unique_import_strings(
 
 fn arbitrary_vec_u8(u: &mut Unstructured) -> Result<Vec<u8>> {
     let size = u.arbitrary_len::<u8>()?;
-    Ok(u.get_bytes(size)?.to_vec())
+    Ok(u.bytes(size)?.to_vec())
 }
 
 impl EntityType {

fuzz/Cargo.toml

@@ -9,7 +9,7 @@ cargo-fuzz = true
 
 [dependencies]
 env_logger = "0.8"
-libfuzzer-sys = "0.3.2"
+libfuzzer-sys = "0.4.0"
 log = "0.4"
 tempfile = "3.0"
 wasm-smith = { path = "../crates/wasm-smith" }