Revert "Remove the need for HostRef<Module> (#778)"

This reverts commit 7b33f1c619.

Pushed a few extra commits by accident, so reverting this.
This commit is contained in:
Alex Crichton
2020-01-08 12:44:59 -08:00
parent 7b33f1c619
commit eb1991c579
22 changed files with 130 additions and 221 deletions

View File

@@ -234,14 +234,15 @@ impl RunCommand {
store: &Store,
module_registry: &HashMap<String, HostRef<Instance>>,
path: &Path,
) -> Result<(HostRef<Instance>, Module, Vec<u8>)> {
) -> Result<(HostRef<Instance>, HostRef<Module>, Vec<u8>)> {
// Read the wasm module binary either as `*.wat` or a raw binary
let data = wat::parse_file(path)?;
let module = Module::new(store, &data)?;
let module = HostRef::new(Module::new(store, &data)?);
// Resolve import using module_registry.
let imports = module
.borrow()
.imports()
.iter()
.map(|i| {
@@ -284,6 +285,7 @@ impl RunCommand {
let data = ModuleData::new(&data)?;
self.invoke_export(instance, &data, name)?;
} else if module
.borrow()
.exports()
.iter()
.any(|export| export.name().is_empty())