From 9a27fdad8693561019251313aeffc316111318b5 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 1 Nov 2021 09:18:11 -0500
Subject: [PATCH] Update v8 used during fuzzing (#3493)

This commit updates the crate name from `rusty_v8` to `v8` as well since
the upstream bindings have sinced moved. I originally wanted to do this
to see if a fix for one of our fuzz bugs was pulled in but I don't think
the fix has been pulled in yet. Despite that it seems reasonable to go
ahead and update.
---
 Cargo.lock                       | 28 ++++++++++++++--------------
 crates/fuzzing/Cargo.toml        |  2 +-
 crates/fuzzing/src/oracles.rs    |  2 +-
 crates/fuzzing/src/oracles/v8.rs |  1 -
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c6fc8a116..e9c268349c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2509,19 +2509,6 @@ dependencies = [
  "wait-timeout",
 ]
 
-[[package]]
-name = "rusty_v8"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fc062fb861b82fa7ac4e1a009da873279a10180d2133574e4219d870038c1c"
-dependencies = [
- "bitflags",
- "fslock",
- "lazy_static",
- "libc",
- "which",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -3056,6 +3043,19 @@ dependencies = [
  "getrandom 0.2.3",
 ]
 
+[[package]]
+name = "v8"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b3adb16fd1af3e28d6fda8348a6d96b5363a128dc5a0216b137b64ecbae6641"
+dependencies = [
+ "bitflags",
+ "fslock",
+ "lazy_static",
+ "libc",
+ "which",
+]
+
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -3532,7 +3532,7 @@ dependencies = [
  "env_logger 0.8.3",
  "log",
  "rayon",
- "rusty_v8",
+ "v8",
  "wasm-encoder",
  "wasm-smith",
  "wasm-spec-interpreter",
diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml
index ae7d73b507..5f0a2c1a66 100644
--- a/crates/fuzzing/Cargo.toml
+++ b/crates/fuzzing/Cargo.toml
@@ -27,7 +27,7 @@ wasmi = "0.7.0"
 # though, so we could use that if we wanted. For now though just simplify a bit
 # and don't depend on this on Windows.  The same applies on s390x.
 [target.'cfg(not(any(windows, target_arch = "s390x")))'.dependencies]
-rusty_v8 = "0.27"
+v8 = "0.33"
 
 [dev-dependencies]
 wat = "1.0.37"
diff --git a/crates/fuzzing/src/oracles.rs b/crates/fuzzing/src/oracles.rs
index 9cfec7cfb0..5483c9876b 100644
--- a/crates/fuzzing/src/oracles.rs
+++ b/crates/fuzzing/src/oracles.rs
@@ -22,7 +22,7 @@ use wasmtime::*;
 use wasmtime_wast::WastContext;
 
 #[cfg(not(any(windows, target_arch = "s390x")))]
-pub use v8::*;
+pub use self::v8::*;
 #[cfg(not(any(windows, target_arch = "s390x")))]
 mod v8;
 
diff --git a/crates/fuzzing/src/oracles/v8.rs b/crates/fuzzing/src/oracles/v8.rs
index 4016b1ffdf..be2549f3de 100644
--- a/crates/fuzzing/src/oracles/v8.rs
+++ b/crates/fuzzing/src/oracles/v8.rs
@@ -1,5 +1,4 @@
 use super::{first_exported_function, first_exported_memory, log_wasm};
-use rusty_v8 as v8;
 use std::convert::TryFrom;
 use std::sync::Once;
 use wasmtime::*;