diff --git a/lib/wasm/src/environ/dummy.rs b/lib/wasm/src/environ/dummy.rs index 4eaab00fb3..21ee1d08a3 100644 --- a/lib/wasm/src/environ/dummy.rs +++ b/lib/wasm/src/environ/dummy.rs @@ -12,7 +12,8 @@ use std::string::String; use std::vec::Vec; use target_lexicon::Triple; use translation_utils::{ - DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table, TableIndex, + DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table, + TableIndex, }; use wasmparser; @@ -426,7 +427,8 @@ impl<'data> ModuleEnvironment<'data> for DummyEnvironment { fn define_function_body(&mut self, body_bytes: &'data [u8]) -> WasmResult<()> { let func = { let mut func_environ = DummyFuncEnvironment::new(&self.info); - let func_index = FuncIndex::new(self.get_num_func_imports() + self.info.function_bodies.len()); + let func_index = + FuncIndex::new(self.get_num_func_imports() + self.info.function_bodies.len()); let name = get_func_name(func_index); let sig = func_environ.vmctx_sig(self.get_func_type(func_index)); let mut func = ir::Function::with_name_signature(name, sig); diff --git a/lib/wasm/src/lib.rs b/lib/wasm/src/lib.rs index b537534bd5..7606ebc0b4 100644 --- a/lib/wasm/src/lib.rs +++ b/lib/wasm/src/lib.rs @@ -50,8 +50,8 @@ pub use environ::{ pub use func_translator::FuncTranslator; pub use module_translator::translate_module; pub use translation_utils::{ - DefinedFuncIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, SignatureIndex, Table, - TableIndex, + DefinedFuncIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, + SignatureIndex, Table, TableIndex, }; #[cfg(not(feature = "std"))] diff --git a/lib/wasm/src/sections_translator.rs b/lib/wasm/src/sections_translator.rs index 949a74f9d1..1ea3ce26ec 100644 --- a/lib/wasm/src/sections_translator.rs +++ b/lib/wasm/src/sections_translator.rs @@ -13,8 +13,8 @@ use environ::{ModuleEnvironment, WasmError, WasmResult}; use std::str::from_utf8; use std::vec::Vec; use translation_utils::{ - type_to_type, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, - SignatureIndex, Table, TableElementType, TableIndex, + type_to_type, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, SignatureIndex, + Table, TableElementType, TableIndex, }; use wasmparser; use wasmparser::{ @@ -383,8 +383,10 @@ pub fn parse_elements_section( }; match *parser.read() { ParserState::ElementSectionEntryBody(ref elements) => { - let elems: Vec = - elements.iter().map(|&x| FuncIndex::new(x as usize)).collect(); + let elems: Vec = elements + .iter() + .map(|&x| FuncIndex::new(x as usize)) + .collect(); environ.declare_table_elements(table_index, base, offset, elems) } ParserState::Error(e) => return Err(WasmError::from_binary_reader_error(e)), diff --git a/lib/wasm/src/translation_utils.rs b/lib/wasm/src/translation_utils.rs index 242e3feef0..752256f3f1 100644 --- a/lib/wasm/src/translation_utils.rs +++ b/lib/wasm/src/translation_utils.rs @@ -8,7 +8,7 @@ use wasmparser; pub struct FuncIndex(u32); entity_impl!(FuncIndex); -/// Index type of a defined function inside the WebAssembly module. +/// Index type of a defined function inside the WebAssembly module. #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] pub struct DefinedFuncIndex(u32); entity_impl!(DefinedFuncIndex);