Upgrade to rustfmt 0.6.0.

cranelift/src/libcretonne/dominator_tree.rs

@@ -108,11 +108,7 @@ impl DominatorTree {
         // TODO: we can't rely on instruction numbers to always be ordered
         // from lowest to highest. Given that, it will be necessary to create
         // an abolute mapping to determine the instruction order in the future.
-        if a.1 == NO_INST || a.1 < b.1 {
+        if a.1 == NO_INST || a.1 < b.1 { a } else { b }
-            a
-        } else {
-            b
-        }
     }
 
     /// Returns the immediate dominator of some ebb or None if the

cranelift/src/libcretonne/ir/entities.rs

@@ -42,11 +42,7 @@ impl EntityRef for Ebb {
 impl Ebb {
     /// Create a new EBB reference from its number. This corresponds to the ebbNN representation.
     pub fn with_number(n: u32) -> Option<Ebb> {
-        if n < u32::MAX {
+        if n < u32::MAX { Some(Ebb(n)) } else { None }
-            Some(Ebb(n))
-        } else {
-            None
-        }
     }
 }
 

cranelift/src/libcretonne/ir/immediates.rs

@@ -60,11 +60,7 @@ impl FromStr for Imm64 {
         let mut value: u64 = 0;
         let mut digits = 0;
         let negative = s.starts_with('-');
-        let s2 = if negative {
+        let s2 = if negative { &s[1..] } else { s };
-            &s[1..]
-        } else {
-            s
-        };
 
         if s2.starts_with("0x") {
             // Hexadecimal.

cranelift/src/libcretonne/ir/instructions.rs

@@ -95,10 +95,7 @@ impl FromStr for Opcode {
 /// `Box<AuxData>` to store the additional information out of line.
 #[derive(Debug)]
 pub enum InstructionData {
-    Nullary {
+    Nullary { opcode: Opcode, ty: Type },
-        opcode: Opcode,
-        ty: Type,
-    },
     Unary {
         opcode: Opcode,
         ty: Type,

cranelift/src/libcretonne/settings.rs

@@ -227,9 +227,7 @@ pub mod detail {
     #[derive(Clone, Copy)]
     pub enum Detail {
         /// A boolean setting only uses one bit, numbered from LSB.
-        Bool {
+        Bool { bit: u8 },
-            bit: u8,
-        },
 
         /// A numerical setting uses the whole byte.
         Num,

cranelift/test-all.sh

@@ -30,7 +30,7 @@ function banner() {
 # rustfmt is installed.
 #
 # This version should always be bumped to the newest version available.
-RUSTFMT_VERSION="0.5.0"
+RUSTFMT_VERSION="0.6.0"
 
 if cargo install --list | grep -q "^rustfmt v$RUSTFMT_VERSION"; then
     banner "Rust formatting"