From 35989f406914e7271de2367d74d8298739e3f622 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 17 Oct 2017 11:48:29 -0700
Subject: [PATCH] Tidy up unneeded references.

---
 lib/cretonne/meta/gen_legalizer.py | 2 +-
 lib/cretonne/src/flowgraph.rs      | 2 +-
 lib/wasm/src/func_translator.rs    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/cretonne/meta/gen_legalizer.py b/lib/cretonne/meta/gen_legalizer.py
index 6d792a13d3..dea0a53950 100644
--- a/lib/cretonne/meta/gen_legalizer.py
+++ b/lib/cretonne/meta/gen_legalizer.py
@@ -363,7 +363,7 @@ def gen_xform_group(xgrp, fmt, type_sets):
     with fmt.indented(') -> bool {', '}'):
         fmt.line('use ir::InstBuilder;')
         fmt.line('use cursor::{Cursor, FuncCursor};')
-        fmt.line('let pos = &mut FuncCursor::new(func).at_inst(inst);')
+        fmt.line('let mut pos = FuncCursor::new(func).at_inst(inst);')
         fmt.line('pos.use_srcloc(inst);')
 
         # Group the xforms by opcode so we can generate a big switch.
diff --git a/lib/cretonne/src/flowgraph.rs b/lib/cretonne/src/flowgraph.rs
index d4ec4ca717..4dfc72fe32 100644
--- a/lib/cretonne/src/flowgraph.rs
+++ b/lib/cretonne/src/flowgraph.rs
@@ -195,7 +195,7 @@ mod tests {
         let jmp_ebb1_ebb2;
 
         {
-            let cur = &mut FuncCursor::new(&mut func);
+            let mut cur = FuncCursor::new(&mut func);
 
             cur.insert_ebb(ebb0);
             br_ebb0_ebb2 = cur.ins().brnz(cond, ebb2, &[]);
diff --git a/lib/wasm/src/func_translator.rs b/lib/wasm/src/func_translator.rs
index b93c3a368f..9a4395c151 100644
--- a/lib/wasm/src/func_translator.rs
+++ b/lib/wasm/src/func_translator.rs
@@ -80,7 +80,7 @@ impl FuncTranslator {
         assert_eq!(func.dfg.num_insts(), 0, "Function must be empty");
 
         // This clears the `ILBuilder`.
-        let builder = &mut FunctionBuilder::new(func, &mut self.il_builder);
+        let mut builder = FunctionBuilder::new(func, &mut self.il_builder);
         let entry_block = builder.create_ebb();
         builder.switch_to_block(entry_block, &[]); // This also creates values for the arguments.
         builder.seal_block(entry_block);
@@ -88,15 +88,15 @@ impl FuncTranslator {
         // `environ`. The callback functions may need to insert things in the entry block.
         builder.ensure_inserted_ebb();
 
-        let num_args = declare_wasm_arguments(builder);
+        let num_args = declare_wasm_arguments(&mut builder);
 
         // Set up the translation state with a single pushed control block representing the whole
         // function and its return values.
         let exit_block = builder.create_ebb();
         self.state.initialize(&builder.func.signature, exit_block);
 
-        parse_local_decls(&mut reader, builder, num_args)?;
-        parse_function_body(reader, builder, &mut self.state, environ)
+        parse_local_decls(&mut reader, &mut builder, num_args)?;
+        parse_function_body(reader, &mut builder, &mut self.state, environ)
     }
 }