Merge remote-tracking branch 'upstream/master' into update

Signed-off-by: koushiro <[email protected]>

Author: koushiro

src/lib.rs

@@ -1,6 +1,8 @@
-#![allow(improper_ctypes)] // we do not actually cross the FFI bound here
+pub use arbitrary;
 
 extern "C" {
+    #![allow(improper_ctypes)] // we do not actually cross the FFI bound here
+
     fn rust_fuzzer_test_input(input: &[u8]);
 }
 
@@ -48,7 +50,7 @@ macro_rules! fuzz_target {
     (|$data:ident: $dty: ty| $body:block) => {
         #[no_mangle]
         pub extern "C" fn rust_fuzzer_test_input(bytes: &[u8]) {
-            use arbitrary::{Arbitrary, RingBuffer};
+            use libfuzzer_sys::arbitrary::{Arbitrary, RingBuffer};
 
             let mut buf = match RingBuffer::new(bytes, bytes.len()) {
                 Ok(b) => b,