Update wasmtime-wasi to new wasi-common interface

This commit is contained in:
Jakub Konka
2019-07-15 23:17:50 +02:00
committed by Dan Gohman
parent 6b7ebfdddc
commit 1531fabf43

View File

@@ -101,12 +101,13 @@ pub fn instantiate_wasi(
let data_initializers = Vec::new(); let data_initializers = Vec::new();
let signatures = PrimaryMap::new(); let signatures = PrimaryMap::new();
let args: Vec<&str> = argv.iter().map(AsRef::as_ref).collect(); let mut wasi_ctx_builder = WasiCtxBuilder::new()
let mut wasi_ctx_builder = WasiCtxBuilder::new().args(&args).inherit_stdio(); .and_then(|ctx| ctx.inherit_stdio())
.and_then(|ctx| ctx.args(argv.iter()))
for (k, v) in environ { .and_then(|ctx| ctx.envs(environ.iter()))
wasi_ctx_builder = wasi_ctx_builder.env(k, v); .map_err(|err| {
} InstantiationError::Resource(format!("couldn't assemble WASI context object: {}", err))
})?;
for (dir, f) in preopened_dirs { for (dir, f) in preopened_dirs {
wasi_ctx_builder = wasi_ctx_builder.preopened_dir( wasi_ctx_builder = wasi_ctx_builder.preopened_dir(