From e7c4e25e77d7fb2181125d8e0ee6a0c28c1fca81 Mon Sep 17 00:00:00 2001
From: Brandon Fish <brandon.j.fish@gmail.com>
Date: Sun, 9 Dec 2018 01:13:47 -0600
Subject: [PATCH] Fix clippy warnings returning the result of a let binding
 from a block

---
 src/webassembly/instance.rs | 11 ++++-------
 src/webassembly/module.rs   | 16 ++++++----------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/webassembly/instance.rs b/src/webassembly/instance.rs
index 301125513..9f2a511f3 100644
--- a/src/webassembly/instance.rs
+++ b/src/webassembly/instance.rs
@@ -61,12 +61,11 @@ fn get_function_addr(
 ) -> *const u8 {
     let index = func_index.index();
     let len = import_functions.len();
-    let func_pointer = if index < len {
+    if index < len {
         import_functions[index]
     } else {
         (functions[index - len]).as_ptr()
-    };
-    func_pointer
+    }
 }
 
 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"
     );
 
-    let old_mem_size = instance
+    instance
         .memory_mut(memory_index as usize)
         .grow(size)
-        .unwrap_or(-1);
-
-    old_mem_size
+        .unwrap_or(-1)
 }
 
 extern "C" fn current_memory(memory_index: u32, instance: &mut Instance) -> u32 {
diff --git a/src/webassembly/module.rs b/src/webassembly/module.rs
index f8191613c..13c2be646 100644
--- a/src/webassembly/module.rs
+++ b/src/webassembly/module.rs
@@ -389,15 +389,13 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
         });
 
         // Create table based on the data above
-        let table = func.create_table(ir::TableData {
+        func.create_table(ir::TableData {
             base_gv,
             min_size: Imm64::new(0),
             bound_gv,
             element_size: Imm64::new(i64::from(self.pointer_bytes())),
             index_type: I64,
-        });
-
-        table
+        })
     }
 
     // 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
-        let heap = func.create_heap(ir::HeapData {
+        func.create_heap(ir::HeapData {
             base: heap_base,
             min_size: 0.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(),
             },
             index_type: I32,
-        });
-
-        heap
+        })
     }
 
     fn make_global(
@@ -518,8 +514,8 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
             // pos.ins().imul_imm(callee, 4)
             callee
         } else {
-            let ext = pos.ins().uextend(ptr, callee);
-            ext
+            pos.ins().uextend(ptr, callee)
+            // let ext = pos.ins().uextend(ptr, callee);
             // pos.ins().imul_imm(ext, 4)
         };
         // let entry_size = native_pointer_size() as i64 * 2;