Fix merge errors

wasmerio · Aug 31, 2022 · 3dc2e26 · 3dc2e26
1 parent a5d0944
commit 3dc2e26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/api/src/js/imports.rs b/lib/api/src/js/imports.rs
@@ -195,6 +195,7 @@ impl Imports {
         module: &Module,
         object: js_sys::Object,
     ) -> Result<Self, WasmError> {
+        use crate::js::externals::VMExtern;
         let module_imports: HashMap<(String, String), ExternType> = module
             .imports()
             .map(|import| {
@@ -217,7 +218,7 @@ impl Imports {
                 let import_js: wasm_bindgen::JsValue = import_entry.get(1);
                 let key = (module_name.clone(), import_name);
                 let extern_type = module_imports.get(&key).unwrap();
-                let export = Export::from_js_value(import_js, store, extern_type.clone())?;
+                let export = VMExtern::from_js_value(import_js, store, extern_type.clone())?;
                 let extern_ = Extern::from_vm_extern(store, export);
                 map.insert(key, extern_);
             }

diff --git a/lib/api/src/js/instance.rs b/lib/api/src/js/instance.rs
@@ -109,7 +109,7 @@ impl Instance {
         instance: WebAssembly::Instance,
     ) -> Result<Self, InstantiationError> {
         use crate::js::externals::VMExtern;
-        let instance_exports = instance.get(store.as_store_ref().objects()).exports();
+        let instance_exports = instance.exports();
         let exports = module
             .exports()
             .map(|export_type| {