Merge branch 'master' into fix/emscripten-translate

# Conflicts:
#	Cargo.lock

lib/runtime-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime-core"
-version = "0.1.1"
+version = "0.1.2"
 description = "Wasmer runtime core library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]

lib/runtime-core/src/backing.rs

@@ -60,7 +60,6 @@ impl LocalBacking {
 
         for (_, mem) in &module.memories {
             // If we use emscripten, we set a fixed initial and maximum
-            debug!("Instance - init memory ({}, {:?})", mem.min, mem.max);
             // let memory = if options.abi == InstanceABI::Emscripten {
             //     // We use MAX_PAGES, so at the end the result is:
             //     // (initial * LinearMemory::PAGE_SIZE) == LinearMemory::DEFAULT_HEAP_SIZE

lib/runtime-core/src/error.rs

@@ -140,6 +140,7 @@ pub enum Error {
     CompileError(CompileError),
     LinkError(Vec<LinkError>),
     RuntimeError(RuntimeError),
+    ResolveError(ResolveError),
     CallError(CallError),
 }
 
@@ -167,6 +168,12 @@ impl From<Box<RuntimeError>> for Box<Error> {
     }
 }
 
+impl From<Box<ResolveError>> for Box<Error> {
+    fn from(resolve_err: Box<ResolveError>) -> Self {
+        Box::new(Error::ResolveError(*resolve_err))
+    }
+}
+
 impl From<Box<CallError>> for Box<Error> {
     fn from(call_err: Box<CallError>) -> Self {
         Box::new(Error::CallError(*call_err))

lib/runtime-core/src/memory.rs

@@ -47,7 +47,6 @@ impl LinearMemory {
     pub fn new(mem: &Memory) -> Self {
         assert!(mem.min <= Self::MAX_PAGES);
         assert!(mem.max.is_none() || mem.max.unwrap() <= Self::MAX_PAGES);
-        debug!("Instantiate LinearMemory(mem: {:?})", mem);
 
         let (mmap_size, initial_pages, offset_guard_size, requires_signal_catch) = if
         /*mem.is_static_heap()*/