Merge branch 'master' into feature/host-env-prototype

lib/api/src/lib.rs

@@ -83,7 +83,17 @@ pub use wasmer_types::{
     Atomically, Bytes, GlobalInit, LocalFunctionIndex, MemoryView, Pages, ValueType,
     WASM_MAX_PAGES, WASM_MIN_PAGES, WASM_PAGE_SIZE,
 };
+
+// TODO: should those be moved into wasmer::vm as well?
 pub use wasmer_vm::{raise_user_trap, Export, MemoryError};
+pub mod vm {
+    //! We use the vm module for re-exporting wasmer-vm types
+
+    pub use wasmer_vm::{
+        Memory, MemoryError, MemoryStyle, Table, TableStyle, VMMemoryDefinition, VMTableDefinition,
+    };
+}
+
 #[cfg(feature = "wat")]
 pub use wat::parse_bytes as wat2wasm;