Merge branch 'master' into feature/benchmarks

This commit is contained in:
Lachlan Sneff
2019-02-22 13:32:09 -08:00
committed by GitHub
7 changed files with 100 additions and 21 deletions

View File

@ -178,7 +178,6 @@ impl Artifact {
magic: WASMER_CACHE_MAGIC,
version: CURRENT_CACHE_VERSION,
data_len: 0,
wasm_hash: self.inner.info.wasm_hash.into_array(),
};
let mut buffer = cache_header.as_slice().to_vec();
@ -203,5 +202,5 @@ pub trait Cache {
type StoreError: fmt::Debug;
fn load(&self, key: WasmHash) -> Result<Module, Self::LoadError>;
fn store(&mut self, module: Module) -> Result<WasmHash, Self::StoreError>;
fn store(&mut self, key: WasmHash, module: Module) -> Result<(), Self::StoreError>;
}

View File

@ -56,8 +56,6 @@ pub struct ModuleInfo {
pub namespace_table: StringTable<NamespaceIndex>,
pub name_table: StringTable<NameIndex>,
pub wasm_hash: WasmHash,
}
/// A compiled WebAssembly module.
@ -116,6 +114,14 @@ impl Module {
}
}
impl Clone for Module {
fn clone(&self) -> Self {
Self {
inner: Arc::clone(&self.inner),
}
}
}
impl ModuleInner {}
#[doc(hidden)]

View File

@ -565,8 +565,6 @@ mod vm_ctx_tests {
namespace_table: StringTable::new(),
name_table: StringTable::new(),
wasm_hash: WasmHash::generate(&[]),
},
}
}