Format with nightly rustfmt-preview, then with rustfmt-0.9 again.

lib/wasm/src/environ/dummy.rs

@@ -1,17 +1,17 @@
 //! "Dummy" environment for testing wasm translation.
 
+use cretonne::cursor::FuncCursor;
+use cretonne::ir::types::*;
+use cretonne::ir::{self, InstBuilder};
+use cretonne::settings;
 use environ::{FuncEnvironment, GlobalValue, ModuleEnvironment};
+use func_translator::FuncTranslator;
+use std::error::Error;
+use std::string::String;
+use std::vec::Vec;
 use translation_utils::{FunctionIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex,
                         Table, TableIndex};
-use func_translator::FuncTranslator;
-use cretonne::ir::{self, InstBuilder};
-use cretonne::ir::types::*;
-use cretonne::cursor::FuncCursor;
-use cretonne::settings;
 use wasmparser;
-use std::error::Error;
-use std::vec::Vec;
-use std::string::String;
 
 /// Compute a `ir::ExternalName` for a given wasm function index.
 fn get_func_name(func_index: FunctionIndex) -> ir::ExternalName {

lib/wasm/src/environ/mod.rs

@@ -1,7 +1,7 @@
 //! Support for configurable wasm translation.
 
-mod spec;
 mod dummy;
+mod spec;
 
-pub use environ::spec::{FuncEnvironment, GlobalValue, ModuleEnvironment};
 pub use environ::dummy::DummyEnvironment;
+pub use environ::spec::{FuncEnvironment, GlobalValue, ModuleEnvironment};

lib/wasm/src/environ/spec.rs

@@ -1,12 +1,12 @@
 //! All the runtime support necessary for the wasm to cretonne translation is formalized by the
 //! traits `FunctionEnvironment` and `ModuleEnvironment`.
-use cretonne::ir::{self, InstBuilder};
 use cretonne::cursor::FuncCursor;
+use cretonne::ir::{self, InstBuilder};
 use cretonne::settings::Flags;
+use std::string::String;
+use std::vec::Vec;
 use translation_utils::{FunctionIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex,
                         Table, TableIndex};
-use std::vec::Vec;
-use std::string::String;
 
 /// The value of a WebAssembly global variable.
 #[derive(Clone, Copy)]