diff --git a/crates/misc/component-fuzz-util/src/lib.rs b/crates/misc/component-fuzz-util/src/lib.rs index 7c6509d404..db963e2009 100644 --- a/crates/misc/component-fuzz-util/src/lib.rs +++ b/crates/misc/component-fuzz-util/src/lib.rs @@ -575,8 +575,8 @@ pub fn rust_type(ty: &Type, name_counter: &mut u32, declarations: &mut TokenStre } } - impl<'a> Arbitrary<'a> for #type_name { - fn arbitrary(input: &mut Unstructured<'a>) -> arbitrary::Result { + impl<'a> arbitrary::Arbitrary<'a> for #type_name { + fn arbitrary(input: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result { let mut flags = #type_name::default(); for flag in [#names] { if input.arbitrary()? { diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 21e00b0e9f..1111473d47 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -10,14 +10,13 @@ cargo-fuzz = true [dependencies] anyhow = { version = "1.0.19" } -arbitrary = { version = "1.1.0", features = ["derive"] } cranelift-codegen = { path = "../cranelift/codegen", features = ["incremental-cache"] } cranelift-reader = { path = "../cranelift/reader" } cranelift-wasm = { path = "../cranelift/wasm" } cranelift-filetests = { path = "../cranelift/filetests" } cranelift-interpreter = { path = "../cranelift/interpreter" } cranelift-fuzzgen = { path = "../cranelift/fuzzgen" } -libfuzzer-sys = "0.4.0" +libfuzzer-sys = { version = "0.4.0", features = ["arbitrary-derive"] } target-lexicon = "0.12" smallvec = "1.6.1" wasmtime = { path = "../crates/wasmtime" } diff --git a/fuzz/build.rs b/fuzz/build.rs index 9e737857c4..caa81dd957 100644 --- a/fuzz/build.rs +++ b/fuzz/build.rs @@ -121,15 +121,15 @@ mod component { let module = quote! { #[allow(unused_imports)] - fn static_component_api_target(input: &mut arbitrary::Unstructured) -> arbitrary::Result<()> { + fn static_component_api_target(input: &mut libfuzzer_sys::arbitrary::Unstructured) -> libfuzzer_sys::arbitrary::Result<()> { use anyhow::Result; - use arbitrary::{Unstructured, Arbitrary}; - use component_test_util::{self, Float32, Float64}; use component_fuzz_util::Declarations; + use component_test_util::{self, Float32, Float64}; + use libfuzzer_sys::arbitrary::{self, Arbitrary}; + use std::borrow::Cow; use std::sync::{Arc, Once}; use wasmtime::component::{ComponentType, Lift, Lower}; use wasmtime_fuzzing::generators::component_types; - use std::borrow::Cow; const SEED: u64 = #seed; diff --git a/fuzz/fuzz_targets/component_api.rs b/fuzz/fuzz_targets/component_api.rs index 7dc76dc4db..aa75ad2947 100644 --- a/fuzz/fuzz_targets/component_api.rs +++ b/fuzz/fuzz_targets/component_api.rs @@ -1,6 +1,6 @@ #![no_main] -use libfuzzer_sys::fuzz_target; +use libfuzzer_sys::{arbitrary, fuzz_target}; use wasmtime_fuzzing::oracles; include!(concat!(env!("OUT_DIR"), "/static_component_api.rs")); diff --git a/fuzz/fuzz_targets/cranelift-fuzzgen.rs b/fuzz/fuzz_targets/cranelift-fuzzgen.rs index ac7aef2b3a..77d5f12bac 100644 --- a/fuzz/fuzz_targets/cranelift-fuzzgen.rs +++ b/fuzz/fuzz_targets/cranelift-fuzzgen.rs @@ -15,7 +15,7 @@ use cranelift_interpreter::interpreter::{ }; use cranelift_interpreter::step::ControlFlow; use cranelift_interpreter::step::CraneliftTrap; -use smallvec::{smallvec, SmallVec}; +use smallvec::smallvec; const INTERPRETER_FUEL: u64 = 4096;