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

lib/reader/src/isaspec.rs

@@ -6,8 +6,8 @@
 //! If a test case file contains `isa` commands, the tests will only be run against the specified
 //! ISAs. If the file contains no `isa` commands, the tests will be run against all supported ISAs.
 
-use cretonne::settings::{Configurable, Error as SetError, Flags};
 use cretonne::isa::TargetIsa;
+use cretonne::settings::{Configurable, Error as SetError, Flags};
 use error::{Location, Result};
 use testcommand::TestOption;
 

lib/reader/src/lexer.rs

@@ -1,12 +1,12 @@
 //! Lexical analysis for .cton files.
 
-use std::str::CharIndices;
-use std::u16;
-#[allow(unused_imports)]
-use std::ascii::AsciiExt;
 use cretonne::ir::types;
 use cretonne::ir::{Ebb, Value};
 use error::Location;
+#[allow(unused_imports)]
+use std::ascii::AsciiExt;
+use std::str::CharIndices;
+use std::u16;
 
 /// A Token returned from the `Lexer`.
 ///

lib/reader/src/lib.rs

@@ -8,16 +8,16 @@
 extern crate cretonne;
 
 pub use error::{Error, Location, Result};
+pub use isaspec::{parse_options, IsaSpec};
 pub use parser::{parse_functions, parse_test};
+pub use sourcemap::SourceMap;
 pub use testcommand::{TestCommand, TestOption};
 pub use testfile::{Comment, Details, TestFile};
-pub use isaspec::{parse_options, IsaSpec};
-pub use sourcemap::SourceMap;
 
 mod error;
+mod isaspec;
 mod lexer;
 mod parser;
-mod testcommand;
-mod isaspec;
-mod testfile;
 mod sourcemap;
+mod testcommand;
+mod testfile;

lib/reader/src/parser.rs

@@ -1,27 +1,27 @@
 //! Parser for .cton files.
 
-use std::str::FromStr;
-use std::{u16, u32};
-use std::mem;
+use cretonne::entity::EntityRef;
+use cretonne::ir;
+use cretonne::ir::entities::AnyEntity;
+use cretonne::ir::immediates::{Ieee32, Ieee64, Imm64, Offset32, Uimm32};
+use cretonne::ir::instructions::{InstructionData, InstructionFormat, VariableArgs};
+use cretonne::ir::types::VOID;
 use cretonne::ir::{AbiParam, ArgumentExtension, ArgumentLoc, CallConv, Ebb, ExtFuncData,
                    ExternalName, FuncRef, Function, GlobalVar, GlobalVarData, Heap, HeapBase,
                    HeapData, HeapStyle, JumpTable, JumpTableData, MemFlags, Opcode, SigRef,
                    Signature, StackSlot, StackSlotData, StackSlotKind, Type, Value, ValueLoc};
-use cretonne::ir;
-use cretonne::ir::types::VOID;
-use cretonne::ir::immediates::{Ieee32, Ieee64, Imm64, Offset32, Uimm32};
-use cretonne::ir::entities::AnyEntity;
-use cretonne::ir::instructions::{InstructionData, InstructionFormat, VariableArgs};
 use cretonne::isa::{self, Encoding, RegUnit, TargetIsa};
-use cretonne::{settings, timing};
-use cretonne::entity::EntityRef;
 use cretonne::packed_option::ReservedValue;
-use testfile::{Comment, Details, TestFile};
+use cretonne::{settings, timing};
 use error::{Error, Location, Result};
-use lexer::{self, Lexer, Token};
-use testcommand::TestCommand;
 use isaspec;
+use lexer::{self, Lexer, Token};
 use sourcemap::SourceMap;
+use std::mem;
+use std::str::FromStr;
+use std::{u16, u32};
+use testcommand::TestCommand;
+use testfile::{Comment, Details, TestFile};
 
 /// Parse the entire `text` into a list of functions.
 ///
@@ -2395,13 +2395,13 @@ impl<'a> Parser<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cretonne::ir::{ArgumentExtension, ArgumentPurpose, CallConv};
-    use cretonne::ir::types;
     use cretonne::ir::StackSlotKind;
     use cretonne::ir::entities::AnyEntity;
-    use testfile::{Comment, Details};
-    use isaspec::IsaSpec;
+    use cretonne::ir::types;
+    use cretonne::ir::{ArgumentExtension, ArgumentPurpose, CallConv};
     use error::Error;
+    use isaspec::IsaSpec;
+    use testfile::{Comment, Details};
 
     #[test]
     fn argument_type() {

lib/reader/src/testfile.rs

@@ -6,10 +6,10 @@
 
 use cretonne::ir::Function;
 use cretonne::ir::entities::AnyEntity;
-use testcommand::TestCommand;
+use error::Location;
 use isaspec::IsaSpec;
 use sourcemap::SourceMap;
-use error::Location;
+use testcommand::TestCommand;
 
 /// A parsed test case.
 ///