fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-29 16:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix clippy warnings returning the result of a let binding from a block

Browse Source
This commit is contained in:
Brandon Fish
2018-12-09 01:13:47 -06:00
parent a857bca9ea
commit e7c4e25e77
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/webassembly/instance.rs
View File

@ -61,12 +61,11 @@ fn get_function_addr(
) -> *const u8 { ) -> *const u8 {
let index = func_index.index(); let index = func_index.index();
let len = import_functions.len(); let len = import_functions.len();
let func_pointer = if index < len { if index < len {
import_functions[index] import_functions[index]
} else { } else {
(functions[index - len]).as_ptr() (functions[index - len]).as_ptr()
}; }
func_pointer
} }
pub struct EmscriptenData { pub struct EmscriptenData {
@ -668,12 +667,10 @@ extern "C" fn grow_memory(size: u32, memory_index: u32, instance: &mut Instance)
"non-default memory_index (0) not supported yet" "non-default memory_index (0) not supported yet"
); );
let old_mem_size = instance instance
.memory_mut(memory_index as usize) .memory_mut(memory_index as usize)
.grow(size) .grow(size)
.unwrap_or(-1); .unwrap_or(-1)
old_mem_size
} }
extern "C" fn current_memory(memory_index: u32, instance: &mut Instance) -> u32 { extern "C" fn current_memory(memory_index: u32, instance: &mut Instance) -> u32 {

16
src/webassembly/module.rs
View File

@ -389,15 +389,13 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
}); });
// Create table based on the data above // Create table based on the data above
let table = func.create_table(ir::TableData { func.create_table(ir::TableData {
base_gv, base_gv,
min_size: Imm64::new(0), min_size: Imm64::new(0),
bound_gv, bound_gv,
element_size: Imm64::new(i64::from(self.pointer_bytes())), element_size: Imm64::new(i64::from(self.pointer_bytes())),
index_type: I64, index_type: I64,
}); })
table
} }
// TODO: offsets should be based on the architecture the wasmer was compiled for. // TODO: offsets should be based on the architecture the wasmer was compiled for.
@ -432,7 +430,7 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
}); });
// Create table based on the data above // Create table based on the data above
let heap = func.create_heap(ir::HeapData { func.create_heap(ir::HeapData {
base: heap_base, base: heap_base,
min_size: 0.into(), min_size: 0.into(),
guard_size: (LinearMemory::DEFAULT_GUARD_SIZE as i64).into(), guard_size: (LinearMemory::DEFAULT_GUARD_SIZE as i64).into(),
@ -440,9 +438,7 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
bound: (LinearMemory::DEFAULT_HEAP_SIZE as i64).into(), bound: (LinearMemory::DEFAULT_HEAP_SIZE as i64).into(),
}, },
index_type: I32, index_type: I32,
}); })
heap
} }
fn make_global( fn make_global(
@ -518,8 +514,8 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
// pos.ins().imul_imm(callee, 4) // pos.ins().imul_imm(callee, 4)
callee callee
} else { } else {
let ext = pos.ins().uextend(ptr, callee); pos.ins().uextend(ptr, callee)
ext // let ext = pos.ins().uextend(ptr, callee);
// pos.ins().imul_imm(ext, 4) // pos.ins().imul_imm(ext, 4)
}; };
// let entry_size = native_pointer_size() as i64 * 2; // let entry_size = native_pointer_size() as i64 * 2;