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

Merge remote-tracking branch 'origin/master' into integrate-lightbeam

Browse Source
This commit is contained in:
Dan Gohman
2019-10-04 16:11:12 -07:00
parent 1017cbbf63 daa3c3aeef
commit 36756613b8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -25,7 +25,7 @@ wasmtime-obj = { path = "wasmtime-obj" }
wasmtime-wast = { path = "wasmtime-wast" } wasmtime-wast = { path = "wasmtime-wast" }
wasmtime-wasi = { path = "wasmtime-wasi" } wasmtime-wasi = { path = "wasmtime-wasi" }
wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true } wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true }
wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "8ea7a983d8b1364e5f62d2adf0e74b3b8db1c9b3"} wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "603f7a9"}
docopt = "1.0.1" docopt = "1.0.1"
serde = { "version" = "1.0.94", features = ["derive"] } serde = { "version" = "1.0.94", features = ["derive"] }
faerie = "0.11.0" faerie = "0.11.0"

2
wasmtime-api/Cargo.toml
View File

@@ -32,7 +32,7 @@ wasm-c-api = []
[dev-dependencies] [dev-dependencies]
# for wasmtime.rs # for wasmtime.rs
wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "8ea7a98"} wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "603f7a9"}
docopt = "1.0.1" docopt = "1.0.1"
serde = { "version" = "1.0.94", features = ["derive"] } serde = { "version" = "1.0.94", features = ["derive"] }
pretty_env_logger = "0.3.0" pretty_env_logger = "0.3.0"

2
wasmtime-wasi/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-runtime = { path = "../wasmtime-runtime" }
wasmtime-environ = { path = "../wasmtime-environ" } wasmtime-environ = { path = "../wasmtime-environ" }
wasmtime-jit = { path = "../wasmtime-jit" } wasmtime-jit = { path = "../wasmtime-jit" }
wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "8ea7a983d8b1364e5f62d2adf0e74b3b8db1c9b3"} wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "603f7a9"}
cranelift-codegen = { version = "0.44.0", features = ["enable-serde"] } cranelift-codegen = { version = "0.44.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.44.0", features = ["enable-serde"] } cranelift-entity = { version = "0.44.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.44.0", features = ["enable-serde"] } cranelift-wasm = { version = "0.44.0", features = ["enable-serde"] }