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

Add/use create_wasi_instance() instead of instantiate_wasi(). (#571)

Browse Source 
* Add/use create_wasi_instance() instead of instantiate_wasi().

* rm Result from Instance::from_handle
This commit is contained in:
Yury Delendik
2019-11-15 18:48:05 -06:00
committed by Dan Gohman
parent 9896a5cabd
commit ea56118651
8 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/misc/py/src/lib.rs
View File

@@ -103,11 +103,8 @@ pub fn instantiate(
// If this module expects to be able to use wasi then go ahead and hook
// that up into the imported crates.
let wasi = if let Some(module_name) = data.find_wasi_module_name() {
let global_exports = store.borrow().global_exports().clone();
let wasi_handle = wasmtime_wasi::instantiate_wasi("", global_exports, &[], &[], &[])
let instance = wasmtime_wasi::create_wasi_instance(&store, &[], &[], &[])
.map_err(|e| err2py(e.into()))?;
let instance =
api::Instance::from_handle(&store, wasi_handle).map_err(|e| err2py(e.into()))?;
Some((module_name, instance))
} else {
None

10
crates/misc/rust/macro/src/lib.rs
View File

@@ -66,14 +66,8 @@ fn generate_load(item: &syn::ItemTrait) -> syn::Result<TokenStream> {
let mut imports: Vec<Extern> = Vec::new();
if let Some(module_name) = data.find_wasi_module_name() {
let wasi_handle = wasmtime_wasi::instantiate_wasi(
"",
global_exports,
&[],
&[],
&[],
)?;
let wasi_instance = Instance::from_handle(&store, wasi_handle)?;
let wasi_instance = wasmtime_wasi::create_wasi_instance(&store, &[], &[], &[])
.map_err(|e| format_err!("wasm instantiation error: {:?}", e))?;
for i in module.borrow().imports().iter() {
if i.module().as_str() != module_name {
bail!("unknown import module {}", i.module().as_str());