diff --git a/lib/environ/src/environ.rs b/lib/environ/src/environ.rs index 85856f65f5..d97db70d77 100644 --- a/lib/environ/src/environ.rs +++ b/lib/environ/src/environ.rs @@ -9,8 +9,8 @@ use cranelift_codegen::ir::{ use cranelift_codegen::isa; use cranelift_codegen::settings; use cranelift_wasm::{ - self, FunctionIndex, Global, GlobalIndex, GlobalVariable, Memory, MemoryIndex, SignatureIndex, Table, - TableIndex, WasmResult, translate_module, + self, translate_module, FunctionIndex, Global, GlobalIndex, GlobalVariable, Memory, + MemoryIndex, SignatureIndex, Table, TableIndex, WasmResult, }; use module::{DataInitializer, Export, LazyContents, Module, TableElements}; use target_lexicon::Triple; diff --git a/lib/obj/src/emit_module.rs b/lib/obj/src/emit_module.rs index a66ac5aac2..73e472f405 100644 --- a/lib/obj/src/emit_module.rs +++ b/lib/obj/src/emit_module.rs @@ -1,7 +1,7 @@ use cranelift_codegen::settings; use cranelift_codegen::settings::Configurable; use faerie::Artifact; -use wasmtime_environ::{Module, Compilation, Relocations}; +use wasmtime_environ::{Compilation, Module, Relocations}; /// Emits a module that has been emitted with the `wasmtime-environ` environment /// implementation to a native object file. diff --git a/src/main.rs b/src/main.rs index 92ed572930..60dc710f68 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,8 +20,8 @@ extern crate cranelift_codegen; extern crate cranelift_native; extern crate docopt; -extern crate wasmtime_execute; extern crate wasmtime_environ; +extern crate wasmtime_execute; #[macro_use] extern crate serde_derive; extern crate tempdir; @@ -39,8 +39,8 @@ use std::path::Path; use std::path::PathBuf; use std::process::{exit, Command}; use tempdir::TempDir; -use wasmtime_execute::{compile_and_link_module, execute, Instance}; use wasmtime_environ::{Module, ModuleEnvironment}; +use wasmtime_execute::{compile_and_link_module, execute, Instance}; const USAGE: &str = " Wasm to Cranelift IL translation utility. diff --git a/src/wasm2obj.rs b/src/wasm2obj.rs index 3aada77a58..b5e9183dff 100644 --- a/src/wasm2obj.rs +++ b/src/wasm2obj.rs @@ -19,8 +19,8 @@ extern crate cranelift_codegen; extern crate cranelift_native; extern crate docopt; -extern crate wasmtime_obj; extern crate wasmtime_environ; +extern crate wasmtime_obj; #[macro_use] extern crate serde_derive; extern crate faerie; @@ -36,8 +36,8 @@ use std::io::prelude::*; use std::path::Path; use std::path::PathBuf; use std::process; -use wasmtime_obj::emit_module; use wasmtime_environ::{compile_module, Module, ModuleEnvironment}; +use wasmtime_obj::emit_module; const USAGE: &str = " Wasm to native object translation utility.