T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasi: switch to use wasmtime-wiggle for wiggle integration

Browse Source
This commit is contained in:
Pat Hickey
2020-06-22 17:23:11 -07:00
parent 712990191a
commit 303f7172a1
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -2567,6 +2567,7 @@ dependencies = [
"wasi-common", "wasi-common",
"wasmtime", "wasmtime",
"wasmtime-runtime", "wasmtime-runtime",
"wasmtime-wiggle",
"wig", "wig",
"wiggle", "wiggle",
] ]

1
crates/wasi/Cargo.toml
View File

@@ -19,6 +19,7 @@ wasmtime = { path = "../wasmtime", version = "0.18.0", default-features = false
wasmtime-runtime = { path = "../runtime", version = "0.18.0" } wasmtime-runtime = { path = "../runtime", version = "0.18.0" }
wig = { path = "../wasi-common/wig", version = "0.18.0" } wig = { path = "../wasi-common/wig", version = "0.18.0" }
wiggle = { path = "../wiggle", version = "0.18.0" } wiggle = { path = "../wiggle", version = "0.18.0" }
wasmtime-wiggle = { path = "../wiggle/wasmtime", version = "0.18.0" }
[badges] [badges]
maintenance = { status = "actively-developed" } maintenance = { status = "actively-developed" }

2
crates/wasi/src/lib.rs
View File

@@ -6,7 +6,7 @@ pub use wasi_common::{WasiCtx, WasiCtxBuilder};
// Defines a `struct Wasi` with member fields and appropriate APIs for dealing // Defines a `struct Wasi` with member fields and appropriate APIs for dealing
// with all the various WASI exports. // 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 { pub fn is_wasi_module(name: &str) -> bool {
// FIXME: this should be more conservative, but while WASI is in flux and // FIXME: this should be more conservative, but while WASI is in flux and