Patch wasmtime-wasi to use this wasi-common version

Cargo.toml

@@ -27,12 +27,16 @@ winapi = { version = "0.3", features=["std", "handleapi", "processthreadsapi", "
 wasmtime-runtime = { git = "https://github.com/cranestation/wasmtime" }
 wasmtime-environ = { git = "https://github.com/cranestation/wasmtime" }
 wasmtime-jit = { git = "https://github.com/cranestation/wasmtime" }
+wasmtime-wasi = { git = "https://github.com/cranestation/wasmtime" }
 cranelift-codegen = "0.30.0"
 cranelift-entity = "0.30.0"
 cranelift-wasm = "0.30.0"
 cranelift-native = "0.30.0"
 target-lexicon = "0.3.0"
 
+[patch."https://github.com/CraneStation/wasi-common"]
+wasi-common = { path = "." }
+
 [lib]
 name = "wasi_common"
 crate-type = ["rlib", "staticlib", "cdylib"]

tests/runtime.rs

@@ -1,7 +1,4 @@
-mod wasi;
-
 use cranelift_codegen::settings;
-use cranelift_native;
 use wasmtime_jit::Context;
 
 pub fn instantiate<S: AsRef<str>>(
@@ -35,7 +32,7 @@ pub fn instantiate<S: AsRef<str>>(
 
     context.name_instance(
         "wasi_unstable".to_owned(),
-        wasi::instantiate_wasi(
+        wasmtime_wasi::instantiate_wasi(
             "",
             global_exports,
             &get_preopens(workspace)?,