Skip to content

Commit

Permalink
Merge branch 'master' into fix-clif-backend-module-new
Browse files Browse the repository at this point in the history
  • Loading branch information
xmclark authored Mar 4, 2019
2 parents 5744f68 + ba8b758 commit b3c60bc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion lib/clif-backend/src/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ impl FuncResolverBuilder {
info: &ModuleInfo,
) -> CompileResult<(Self, HandlerData)> {
let num_func_bodies = function_bodies.len();
let mut compiled_functions: Vec<(Vec<u8>, RelocSink)> = Vec::with_capacity(num_func_bodies);
let mut local_relocs = Map::with_capacity(num_func_bodies);
let mut external_relocs = Map::with_capacity(num_func_bodies);

Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ impl WasmHash {
let mut state = blake2bp::State::new();
state.update(wasm);

let mut hasher = state.finalize();
let hasher = state.finalize();
let generic_array = hasher.as_bytes();

first_part.copy_from_slice(&generic_array[0..32]);
Expand Down
1 change: 0 additions & 1 deletion lib/runtime-core/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::sys::Memory;
use crate::types::{
FuncSig, GlobalDescriptor, MemoryDescriptor, MemoryIndex, TableDescriptor, TableIndex, Type,
};
Expand Down

0 comments on commit b3c60bc

Please sign in to comment.