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

cranelift/src/cat.rs

@@ -3,8 +3,8 @@
 //! Read a sequence of Cretonne IR files and print them again to stdout. This has the effect of
 //! normalizing formatting and removing comments.
 
-use cton_reader::parse_functions;
 use CommandResult;
+use cton_reader::parse_functions;
 use utils::read_to_string;
 
 pub fn run(files: &[String]) -> CommandResult {

cranelift/src/compile.rs

@@ -1,12 +1,12 @@
 //! CLI tool to read Cretonne IR files and compile them into native code.
 
-use cton_reader::parse_test;
-use std::path::PathBuf;
 use cretonne::Context;
+use cretonne::print_errors::pretty_error;
 use cretonne::settings::FlagsOrIsa;
 use cretonne::{binemit, ir};
-use cretonne::print_errors::pretty_error;
+use cton_reader::parse_test;
 use std::path::Path;
+use std::path::PathBuf;
 use utils::{parse_sets_and_isa, read_to_string};
 
 struct PrintRelocs {

cranelift/src/cton-util.rs

@@ -14,12 +14,12 @@ use docopt::Docopt;
 use std::io::{self, Write};
 use std::process;
 
-mod utils;
 mod cat;
+mod compile;
 mod print_cfg;
 mod rsfilecheck;
+mod utils;
 mod wasm;
-mod compile;
 
 const USAGE: &str = "
 Cretonne code generator utility

cranelift/src/rsfilecheck.rs

@@ -3,9 +3,9 @@
 //! This file is named to avoid a name collision with the filecheck crate.
 
 use CommandResult;
-use utils::read_to_string;
 use filecheck::{Checker, CheckerBuilder, NO_VARIABLES};
 use std::io::{self, Read};
+use utils::read_to_string;
 
 pub fn run(files: &[String], verbose: bool) -> CommandResult {
     if files.is_empty() {

cranelift/src/utils.rs

@@ -1,8 +1,8 @@
 //! Utility functions.
 
+use cretonne::isa;
 use cretonne::isa::TargetIsa;
 use cretonne::settings::{self, FlagsOrIsa};
-use cretonne::isa;
 use cton_reader::{parse_options, Location};
 use std::fs::File;
 use std::io::{self, Read};

cranelift/src/wasm.rs

@@ -3,15 +3,15 @@
 //! Reads Wasm binary files, translates the functions' code to Cretonne IR.
 #![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments, cyclomatic_complexity))]
 
-use cton_wasm::{translate_module, DummyEnvironment, ModuleEnvironment};
-use std::path::PathBuf;
 use cretonne::Context;
-use cretonne::settings::FlagsOrIsa;
 use cretonne::print_errors::{pretty_error, pretty_verifier_error};
-use std::fs::File;
+use cretonne::settings::FlagsOrIsa;
+use cton_wasm::{translate_module, DummyEnvironment, ModuleEnvironment};
 use std::error::Error;
+use std::fs::File;
 use std::io;
 use std::path::Path;
+use std::path::PathBuf;
 use std::process::Command;
 use tempdir::TempDir;
 use term;