From da2c2151b1bd5d8cd84ca5bf0aa9172a2e8a64a7 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Thu, 31 Aug 2017 12:07:54 -0700
Subject: [PATCH] Fix trivial_numeric_casts errors.

---
 lib/wasm/src/code_translator.rs   | 24 +++++++++---------------
 lib/wasm/src/module_translator.rs |  2 +-
 lib/wasm/src/runtime/dummy.rs     |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/lib/wasm/src/code_translator.rs b/lib/wasm/src/code_translator.rs
index d6fd219bd5..a98c9ad4f5 100644
--- a/lib/wasm/src/code_translator.rs
+++ b/lib/wasm/src/code_translator.rs
@@ -186,7 +186,7 @@ pub fn translate_function_body(
         for (i, arg_type) in sig.argument_types.iter().enumerate() {
             // First we declare the function arguments' as non-SSA vars because they will be
             // accessed by get_local
-            let arg_value = builder.arg_value(i as usize);
+            let arg_value = builder.arg_value(i);
             builder.declare_var(Local(i as u32), arg_type.value_type);
             builder.def_var(Local(i as u32), arg_value);
         }
@@ -566,7 +566,7 @@ fn translate_operator(
                 for (depth, dest_ebb) in dest_ebbs {
                     builder.switch_to_block(dest_ebb, &[]);
                     builder.seal_block(dest_ebb);
-                    let i = control_stack.len() - 1 - (depth as usize);
+                    let i = control_stack.len() - 1 - depth;
                     let frame = &mut control_stack[i];
                     let real_dest_ebb = frame.br_destination();
                     builder.ins().jump(real_dest_ebb, jump_args.as_slice());
@@ -1294,7 +1294,7 @@ fn args_count(
     functions: &[SignatureIndex],
     signatures: &[Signature],
 ) -> usize {
-    signatures[functions[index] as usize].argument_types.len()
+    signatures[functions[index]].argument_types.len()
 }
 
 // Given a index in the function index space, search for it in the function imports and if it is
@@ -1312,7 +1312,7 @@ fn find_function_import(
     }
     // We have to import the function
     let sig_index = functions[index];
-    if let Some(local_sig_index) = func_imports.signatures.get(&(sig_index as usize)) {
+    if let Some(local_sig_index) = func_imports.signatures.get(&sig_index) {
         let local_func_index = builder.import_function(ExtFuncData {
             name: match *exports {
                 None => FunctionName::new(""),
@@ -1329,11 +1329,8 @@ fn find_function_import(
         return local_func_index;
     }
     // We have to import the signature
-    let sig_local_index = builder.import_signature(signatures[sig_index as usize].clone());
-    func_imports.signatures.insert(
-        sig_index as usize,
-        sig_local_index,
-    );
+    let sig_local_index = builder.import_signature(signatures[sig_index].clone());
+    func_imports.signatures.insert(sig_index, sig_local_index);
     let local_func_index = builder.import_function(ExtFuncData {
         name: match *exports {
             None => FunctionName::new(""),
@@ -1356,13 +1353,10 @@ fn find_signature_import(
     func_imports: &mut FunctionImports,
     signatures: &[Signature],
 ) -> SigRef {
-    if let Some(local_sig_index) = func_imports.signatures.get(&(sig_index as usize)) {
+    if let Some(local_sig_index) = func_imports.signatures.get(&sig_index) {
         return *local_sig_index;
     }
-    let sig_local_index = builder.import_signature(signatures[sig_index as usize].clone());
-    func_imports.signatures.insert(
-        sig_index as usize,
-        sig_local_index,
-    );
+    let sig_local_index = builder.import_signature(signatures[sig_index].clone());
+    func_imports.signatures.insert(sig_index, sig_local_index);
     sig_local_index
 }
diff --git a/lib/wasm/src/module_translator.rs b/lib/wasm/src/module_translator.rs
index ba99b5593b..22bf59d17e 100644
--- a/lib/wasm/src/module_translator.rs
+++ b/lib/wasm/src/module_translator.rs
@@ -256,7 +256,7 @@ pub fn translate_module(
             ParserState::EndSection => break,
             _ => return Err(String::from("wrong content in code section")),
         };
-        let signature = signatures[functions[function_index as usize] as usize].clone();
+        let signature = signatures[functions[function_index]].clone();
         match translate_function_body(
             &mut parser,
             function_index,
diff --git a/lib/wasm/src/runtime/dummy.rs b/lib/wasm/src/runtime/dummy.rs
index 7e8dc02005..c6e1741dc2 100644
--- a/lib/wasm/src/runtime/dummy.rs
+++ b/lib/wasm/src/runtime/dummy.rs
@@ -26,7 +26,7 @@ impl WasmRuntime for DummyRuntime {
         builder: &mut FunctionBuilder<Local>,
         global_index: GlobalIndex,
     ) -> Value {
-        let glob = self.globals[global_index as usize];
+        let glob = self.globals[global_index];
         match glob.ty {
             I32 => builder.ins().iconst(glob.ty, -1),
             I64 => builder.ins().iconst(glob.ty, -1),