From 03698f6bc8560e77e3f78dad43286870e85fa667 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 10 Aug 2017 14:18:27 -0700 Subject: [PATCH] Use slices rather than Vec borrows. https://github.com/rust-lang-nursery/rust-clippy/wiki#ptr_arg --- lib/frontend/src/ssa.rs | 2 +- lib/wasm/src/code_translator.rs | 20 ++++++++++---------- lib/wasm/src/sections_translator.rs | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/frontend/src/ssa.rs b/lib/frontend/src/ssa.rs index 9e4969ebb6..d5d2b51bc4 100644 --- a/lib/frontend/src/ssa.rs +++ b/lib/frontend/src/ssa.rs @@ -433,7 +433,7 @@ impl SSABuilder temp_arg_val: Value, temp_arg_var: Variable, dest_ebb: Ebb, - preds: &Vec<(Block, Inst)>) + preds: &[(Block, Inst)]) -> (Value, SideEffects) { let mut pred_values: ZeroOneOrMore = ZeroOneOrMore::Zero(); // TODO: find a way not not allocate a vector diff --git a/lib/wasm/src/code_translator.rs b/lib/wasm/src/code_translator.rs index efd54617f4..d720ea34fc 100644 --- a/lib/wasm/src/code_translator.rs +++ b/lib/wasm/src/code_translator.rs @@ -156,10 +156,10 @@ impl FunctionImports { pub fn translate_function_body(parser: &mut Parser, function_index: FunctionIndex, sig: Signature, - locals: &Vec<(usize, Type)>, + locals: &[(usize, Type)], exports: &Option>, - signatures: &Vec, - functions: &Vec, + signatures: &[Signature], + functions: &[SignatureIndex], il_builder: &mut ILBuilder, runtime: &mut WasmRuntime) -> Result<(Function, FunctionImports), String> { @@ -288,8 +288,8 @@ fn translate_operator(op: &Operator, control_stack: &mut Vec, state: &mut TranslationState, sig: &Signature, - functions: &Vec, - signatures: &Vec, + functions: &[SignatureIndex], + signatures: &[Signature], exports: &Option>, func_imports: &mut FunctionImports) { // This big match treats all Wasm code operators. @@ -1290,8 +1290,8 @@ fn translate_unreachable_operator(op: &Operator, } fn args_count(index: FunctionIndex, - functions: &Vec, - signatures: &Vec) + functions: &[SignatureIndex], + signatures: &[Signature]) -> usize { signatures[functions[index] as usize].argument_types.len() } @@ -1301,9 +1301,9 @@ fn args_count(index: FunctionIndex, fn find_function_import(index: FunctionIndex, builder: &mut FunctionBuilder, func_imports: &mut FunctionImports, - functions: &Vec, + functions: &[SignatureIndex], exports: &Option>, - signatures: &Vec) + signatures: &[Signature]) -> FuncRef { match func_imports.functions.get(&index) { Some(local_index) => return *local_index, @@ -1358,7 +1358,7 @@ fn find_function_import(index: FunctionIndex, fn find_signature_import(sig_index: SignatureIndex, builder: &mut FunctionBuilder, func_imports: &mut FunctionImports, - signatures: &Vec) + signatures: &[Signature]) -> SigRef { match func_imports.signatures.get(&(sig_index as usize)) { Some(local_sig_index) => return *local_sig_index, diff --git a/lib/wasm/src/sections_translator.rs b/lib/wasm/src/sections_translator.rs index c9954e00c6..574c606063 100644 --- a/lib/wasm/src/sections_translator.rs +++ b/lib/wasm/src/sections_translator.rs @@ -224,7 +224,7 @@ pub fn parse_global_section(parser: &mut Parser, pub fn parse_data_section(parser: &mut Parser, runtime: &mut WasmRuntime, - globals: &Vec) + globals: &[Global]) -> Result<(), SectionParsingError> { loop { let memory_index = match *parser.read() { @@ -314,7 +314,7 @@ pub fn parse_table_section(parser: &mut Parser, /// Retrieves the tables from the table section pub fn parse_elements_section(parser: &mut Parser, runtime: &mut WasmRuntime, - globals: &Vec) + globals: &[Global]) -> Result<(), SectionParsingError> { loop { let table_index = match *parser.read() {