Update to Rust 2018 edition (#632)

* initial cargo fix run

* Upgrade cranelift-entity crate

* Upgrade bforest crate

* Upgrade the codegen crate

* Upgrade the faerie crate

* Upgrade the filetests crate

* Upgrade the codegen-meta crate

* Upgrade the frontend crate

* Upgrade the cranelift-module crate

* Upgrade the cranelift-native crate

* Upgrade the cranelift-preopt crate

* Upgrade the cranelift-reader crate

* Upgrade the cranelift-serde crate

* Upgrade the cranelift-simplejit crate

* Upgrade the cranelift or cranelift-umbrella crate

* Upgrade the cranelift-wasm crate

* Upgrade cranelift-tools crate

* Use new import style on remaining files

* run format-all.sh

* run test-all.sh, update Readme and travis ci configuration
fixed an AssertionError also

* Remove deprecated functions

lib/wasm/Cargo.toml

@@ -8,6 +8,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 categories = ["no-std", "wasm"]
 readme = "README.md"
 keywords = ["webassembly", "wasm"]
+edition = "2018"
 
 [dependencies]
 wasmparser = { version = "0.23.0", default-features = false }

lib/wasm/src/code_translator.rs

@@ -22,18 +22,18 @@
 //!
 //! That is why `translate_function_body` takes an object having the `WasmRuntime` trait as
 //! argument.
+use crate::environ::{FuncEnvironment, GlobalVariable, ReturnMode, WasmError, WasmResult};
+use crate::state::{ControlStackFrame, TranslationState};
+use crate::translation_utils::{f32_translation, f64_translation, num_return_values, type_to_type};
+use crate::translation_utils::{FuncIndex, MemoryIndex, SignatureIndex, TableIndex};
 use cranelift_codegen::ir::condcodes::{FloatCC, IntCC};
 use cranelift_codegen::ir::types::*;
 use cranelift_codegen::ir::{self, InstBuilder, JumpTableData, MemFlags};
 use cranelift_codegen::packed_option::ReservedValue;
 use cranelift_frontend::{FunctionBuilder, Variable};
-use environ::{FuncEnvironment, GlobalVariable, ReturnMode, WasmError, WasmResult};
-use state::{ControlStackFrame, TranslationState};
 use std::collections::{hash_map, HashMap};
 use std::vec::Vec;
 use std::{i32, u32};
-use translation_utils::{f32_translation, f64_translation, num_return_values, type_to_type};
-use translation_utils::{FuncIndex, MemoryIndex, SignatureIndex, TableIndex};
 use wasmparser::{MemoryImmediate, Operator};
 
 // Clippy warns about "flags: _" but its important to document that the flags field is ignored

lib/wasm/src/environ/dummy.rs

@@ -5,6 +5,12 @@
 //! [wasmtime-environ]: https://crates.io/crates/wasmtime-environ
 //! [Wasmtime]: https://github.com/CraneStation/wasmtime
 
+use crate::environ::{FuncEnvironment, GlobalVariable, ModuleEnvironment, ReturnMode, WasmResult};
+use crate::func_translator::FuncTranslator;
+use crate::translation_utils::{
+    DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table,
+    TableIndex,
+};
 use cast;
 use cranelift_codegen::cursor::FuncCursor;
 use cranelift_codegen::ir::immediates::{Offset32, Uimm64};
@@ -12,14 +18,8 @@ use cranelift_codegen::ir::types::*;
 use cranelift_codegen::ir::{self, InstBuilder};
 use cranelift_codegen::isa::TargetFrontendConfig;
 use cranelift_entity::{EntityRef, PrimaryMap};
-use environ::{FuncEnvironment, GlobalVariable, ModuleEnvironment, ReturnMode, WasmResult};
-use func_translator::FuncTranslator;
 use std::string::String;
 use std::vec::Vec;
-use translation_utils::{
-    DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table,
-    TableIndex,
-};
 
 /// Compute a `ir::ExternalName` for a given wasm function index.
 fn get_func_name(func_index: FuncIndex) -> ir::ExternalName {

lib/wasm/src/environ/mod.rs

@@ -3,7 +3,7 @@
 mod dummy;
 mod spec;
 
-pub use environ::dummy::DummyEnvironment;
-pub use environ::spec::{
+pub use crate::environ::dummy::DummyEnvironment;
+pub use crate::environ::spec::{
     FuncEnvironment, GlobalVariable, ModuleEnvironment, ReturnMode, WasmError, WasmResult,
 };

lib/wasm/src/environ/spec.rs

@@ -6,15 +6,16 @@
 //!
 //! [Wasmtime]: https://github.com/CraneStation/wasmtime
 
+use crate::translation_utils::{
+    FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table, TableIndex,
+};
 use cranelift_codegen::cursor::FuncCursor;
 use cranelift_codegen::ir::immediates::Offset32;
 use cranelift_codegen::ir::{self, InstBuilder};
 use cranelift_codegen::isa::TargetFrontendConfig;
+use failure_derive::Fail;
 use std::convert::From;
 use std::vec::Vec;
-use translation_utils::{
-    FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table, TableIndex,
-};
 use wasmparser::BinaryReaderError;
 
 /// The value of a WebAssembly global variable.

lib/wasm/src/func_translator.rs

@@ -4,13 +4,14 @@
 //! function to Cranelift IR guided by a `FuncEnvironment` which provides information about the
 //! WebAssembly module and the runtime environment.
 
-use code_translator::translate_operator;
+use crate::code_translator::translate_operator;
+use crate::environ::{FuncEnvironment, ReturnMode, WasmResult};
+use crate::state::TranslationState;
 use cranelift_codegen::entity::EntityRef;
 use cranelift_codegen::ir::{self, Ebb, InstBuilder};
 use cranelift_codegen::timing;
 use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
-use environ::{FuncEnvironment, ReturnMode, WasmResult};
-use state::TranslationState;
+use log::info;
 use wasmparser::{self, BinaryReader};
 
 /// WebAssembly to Cranelift IR function translator.
@@ -231,9 +232,10 @@ fn cur_srcloc(reader: &BinaryReader) -> ir::SourceLoc {
 #[cfg(test)]
 mod tests {
     use super::{FuncTranslator, ReturnMode};
+    use crate::environ::DummyEnvironment;
     use cranelift_codegen::ir::types::I32;
     use cranelift_codegen::{ir, isa, settings, Context};
-    use environ::DummyEnvironment;
+    use log::debug;
     use target_lexicon::PointerWidth;
 
     #[test]

lib/wasm/src/lib.rs

@@ -33,22 +33,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(not(feature = "std"), feature(alloc))]
 
-extern crate cranelift_codegen;
-#[macro_use]
-extern crate cranelift_entity;
-extern crate cast;
-extern crate cranelift_frontend;
-#[cfg(test)]
-extern crate target_lexicon;
-extern crate wasmparser;
-
-extern crate failure;
-#[macro_use]
-extern crate failure_derive;
-
-#[macro_use]
-extern crate log;
-
 mod code_translator;
 mod environ;
 mod func_translator;
@@ -57,13 +41,13 @@ mod sections_translator;
 mod state;
 mod translation_utils;
 
-pub use environ::{
+pub use crate::environ::{
     DummyEnvironment, FuncEnvironment, GlobalVariable, ModuleEnvironment, ReturnMode, WasmError,
     WasmResult,
 };
-pub use func_translator::FuncTranslator;
-pub use module_translator::translate_module;
-pub use translation_utils::{
+pub use crate::func_translator::FuncTranslator;
+pub use crate::module_translator::translate_module;
+pub use crate::translation_utils::{
     DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, FuncIndex, Global,
     GlobalIndex, GlobalInit, Memory, MemoryIndex, SignatureIndex, Table, TableElementType,
     TableIndex,

lib/wasm/src/module_translator.rs

@@ -1,12 +1,12 @@
 //! Translation skeleton that traverses the whole WebAssembly module and call helper functions
 //! to deal with each part of it.
-use cranelift_codegen::timing;
-use environ::{ModuleEnvironment, WasmResult};
-use sections_translator::{
+use crate::environ::{ModuleEnvironment, WasmResult};
+use crate::sections_translator::{
     parse_code_section, parse_data_section, parse_element_section, parse_export_section,
     parse_function_section, parse_global_section, parse_import_section, parse_memory_section,
     parse_start_section, parse_table_section, parse_type_section,
 };
+use cranelift_codegen::timing;
 use wasmparser::{ModuleReader, SectionCode};
 
 /// Translate a sequence of bytes forming a valid Wasm binary into a list of valid Cranelift IR

lib/wasm/src/sections_translator.rs

@@ -7,15 +7,15 @@
 //! The special case of the initialize expressions for table elements offsets or global variables
 //! is handled, according to the semantics of WebAssembly, to only specific expressions that are
 //! interpreted on the fly.
-use cranelift_codegen::ir::{self, AbiParam, Signature};
-use cranelift_entity::EntityRef;
-use environ::{ModuleEnvironment, WasmResult};
-use std::str::from_utf8;
-use std::vec::Vec;
-use translation_utils::{
+use crate::environ::{ModuleEnvironment, WasmResult};
+use crate::translation_utils::{
     type_to_type, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, SignatureIndex,
     Table, TableElementType, TableIndex,
 };
+use cranelift_codegen::ir::{self, AbiParam, Signature};
+use cranelift_entity::EntityRef;
+use std::str::from_utf8;
+use std::vec::Vec;
 use wasmparser::{
     self, CodeSectionReader, Data, DataSectionReader, Element, ElementSectionReader, Export,
     ExportSectionReader, ExternalKind, FuncType, FunctionSectionReader, GlobalSectionReader,

lib/wasm/src/state.rs

@@ -3,11 +3,11 @@
 //! The `TranslationState` struct defined in this module is used to keep track of the WebAssembly
 //! value and control stacks during the translation of a single function.
 
+use crate::environ::{FuncEnvironment, GlobalVariable};
+use crate::translation_utils::{FuncIndex, GlobalIndex, MemoryIndex, SignatureIndex, TableIndex};
 use cranelift_codegen::ir::{self, Ebb, Inst, Value};
-use environ::{FuncEnvironment, GlobalVariable};
 use std::collections::HashMap;
 use std::vec::Vec;
-use translation_utils::{FuncIndex, GlobalIndex, MemoryIndex, SignatureIndex, TableIndex};
 
 /// A control stack frame can be an `if`, a `block` or a `loop`, each one having the following
 /// fields:

lib/wasm/src/translation_utils.rs

@@ -1,4 +1,5 @@
 //! Helper functions and structures for the translation.
+use cranelift_codegen::entity::entity_impl;
 use cranelift_codegen::ir;
 use std::u32;
 use wasmparser;

lib/wasm/tests/wasm_testsuite.rs

@@ -1,9 +1,3 @@
-extern crate cranelift_codegen;
-extern crate cranelift_wasm;
-#[macro_use]
-extern crate target_lexicon;
-extern crate wabt;
-
 use cranelift_codegen::isa;
 use cranelift_codegen::print_errors::pretty_verifier_error;
 use cranelift_codegen::settings::{self, Flags};
@@ -15,6 +9,7 @@ use std::io;
 use std::io::prelude::*;
 use std::path::Path;
 use std::str::FromStr;
+use target_lexicon::triple;
 use wabt::wat2wasm;
 
 #[test]