From 303f7172a146c79c83153b7c4800a990a11dee47 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Mon, 22 Jun 2020 17:23:11 -0700
Subject: [PATCH] wasi: switch to use wasmtime-wiggle for wiggle integration

---
 Cargo.lock             | 1 +
 crates/wasi/Cargo.toml | 1 +
 crates/wasi/src/lib.rs | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index a81dd32301..e4bea38be3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2567,6 +2567,7 @@ dependencies = [
  "wasi-common",
  "wasmtime",
  "wasmtime-runtime",
+ "wasmtime-wiggle",
  "wig",
  "wiggle",
 ]
diff --git a/crates/wasi/Cargo.toml b/crates/wasi/Cargo.toml
index 6616a6ef12..229816ebb7 100644
--- a/crates/wasi/Cargo.toml
+++ b/crates/wasi/Cargo.toml
@@ -19,6 +19,7 @@ wasmtime = { path = "../wasmtime", version = "0.18.0", default-features = false
 wasmtime-runtime = { path = "../runtime", version = "0.18.0" }
 wig = { path = "../wasi-common/wig", version = "0.18.0" }
 wiggle = { path = "../wiggle", version = "0.18.0" }
+wasmtime-wiggle = { path = "../wiggle/wasmtime", version = "0.18.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }
diff --git a/crates/wasi/src/lib.rs b/crates/wasi/src/lib.rs
index e92b1d21d9..12d1d8d89c 100644
--- a/crates/wasi/src/lib.rs
+++ b/crates/wasi/src/lib.rs
@@ -6,7 +6,7 @@ pub use wasi_common::{WasiCtx, WasiCtxBuilder};
 
 // Defines a `struct Wasi` with member fields and appropriate APIs for dealing
 // with all the various WASI exports.
-wig::define_wasi_struct_for_wiggle!("phases/snapshot/witx/wasi_snapshot_preview1.witx");
+wasmtime_wiggle::define_struct_for_wiggle!("phases/snapshot/witx/wasi_snapshot_preview1.witx");
 
 pub fn is_wasi_module(name: &str) -> bool {
     // FIXME: this should be more conservative, but while WASI is in flux and