fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-15 09:51:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
Brandon Fish
2019-02-04 18:46:10 -06:00
parent cc3c9b6df3
commit 1322446f04
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/emscripten/src/lib.rs
View File

@ -12,7 +12,7 @@ use wasmer_runtime_core::{
global::Global, global::Global,
import::{ImportObject, Namespace}, import::{ImportObject, Namespace},
imports, imports,
memory::Memory, memory::{Memory, MemoryVariant},
table::Table, table::Table,
types::{ types::{
ElementType, FuncSig, GlobalDescriptor, MemoryDescriptor, TableDescriptor, ElementType, FuncSig, GlobalDescriptor, MemoryDescriptor, TableDescriptor,
@ -322,7 +322,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
let import_object = imports! { let import_object = imports! {
"env" => { "env" => {
"memory" => Export::Memory(globals.memory.clone()), "memory" => Export::Memory(MemoryVariant::Unshared(globals.memory.clone())),
"table" => Export::Table(globals.table.clone()), "table" => Export::Table(globals.table.clone()),
// Globals // Globals

2
lib/emscripten/tests/emtests/_common.rs
View File

@ -18,7 +18,7 @@ macro_rules! assert_emscripten_output {
let mut emscripten_globals = EmscriptenGlobals::new(&module); let mut emscripten_globals = EmscriptenGlobals::new(&module);
let import_object = generate_emscripten_env(&mut emscripten_globals); let import_object = generate_emscripten_env(&mut emscripten_globals);
let mut instance = module.instantiate(import_object) let mut instance = module.instantiate(&import_object)
.map_err(|err| format!("Can't instantiate the WebAssembly module: {:?}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ?? .map_err(|err| format!("Can't instantiate the WebAssembly module: {:?}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ??
let capturer = StdioCapturer::new(); let capturer = StdioCapturer::new();