Update to rustfmt-preview (#348)

* Update to rustfmt-preview.

* Run "cargo fmt --all" with rustfmt 0.4.1.

rustfmt 0.4.1 is the latest release of rustfmt-preview available on the
stable channel.

* Fix a long line that rustfmt 0.4.1 can't handle.

* Remove unneeded commas left behind by rustfmt.

lib/codegen/src/binemit/mod.rs

@@ -7,7 +7,7 @@ mod memorysink;
 mod relaxation;
 mod shrink;
 
-pub use self::memorysink::{MemoryCodeSink, RelocSink, TrapSink, NullTrapSink};
+pub use self::memorysink::{MemoryCodeSink, NullTrapSink, RelocSink, TrapSink};
 pub use self::relaxation::relax_branches;
 pub use self::shrink::shrink_instructions;
 pub use regalloc::RegDiversions;

lib/codegen/src/binemit/relaxation.rs

@@ -78,8 +78,8 @@ pub fn relax_branches(func: &mut Function, isa: &TargetIsa) -> Result<CodeOffset
                         let dest_offset = cur.func.offsets[dest];
                         // This could be an out-of-range branch.
                         // Relax it unless the destination offset has not been computed yet.
-                        if !range.contains(offset, dest_offset) &&
-                            (dest_offset != 0 || Some(dest) == cur.func.layout.entry_block())
+                        if !range.contains(offset, dest_offset)
+                            && (dest_offset != 0 || Some(dest) == cur.func.layout.entry_block())
                         {
                             offset += relax_branch(&mut cur, offset, dest_offset, &encinfo, isa);
                             continue;
@@ -148,14 +148,14 @@ fn relax_branch(
     // Pick the first encoding that can handle the branch range.
     let dfg = &cur.func.dfg;
     let ctrl_type = dfg.ctrl_typevar(inst);
-    if let Some(enc) = isa.legal_encodings(cur.func, &dfg[inst], ctrl_type).find(
-        |&enc| {
+    if let Some(enc) = isa.legal_encodings(cur.func, &dfg[inst], ctrl_type)
+        .find(|&enc| {
             let range = encinfo.branch_range(enc).expect("Branch with no range");
             if !range.contains(offset, dest_offset) {
                 dbg!("  trying [{}]: out of range", encinfo.display(enc));
                 false
-            } else if encinfo.operand_constraints(enc) !=
-                       encinfo.operand_constraints(cur.func.encodings[inst])
+            } else if encinfo.operand_constraints(enc)
+                != encinfo.operand_constraints(cur.func.encodings[inst])
             {
                 // Conservatively give up if the encoding has different constraints
                 // than the original, so that we don't risk picking a new encoding
@@ -168,9 +168,7 @@ fn relax_branch(
                 dbg!("  trying [{}]: OK", encinfo.display(enc));
                 true
             }
-        },
-    )
-    {
+        }) {
         cur.func.encodings[inst] = enc;
         return encinfo.bytes(enc);
     }

lib/codegen/src/binemit/shrink.rs

@@ -23,9 +23,7 @@ pub fn shrink_instructions(func: &mut Function, isa: &TargetIsa) {
 
                 // Pick the last encoding with constraints that are satisfied.
                 let best_enc = isa.legal_encodings(func, &func.dfg[inst], ctrl_type)
-                    .filter(|e| {
-                        encinfo.constraints[e.recipe()].satisfied(inst, &divert, &func)
-                    })
+                    .filter(|e| encinfo.constraints[e.recipe()].satisfied(inst, &divert, &func))
                     .min_by_key(|e| encinfo.bytes(*e))
                     .unwrap();
 
@@ -41,7 +39,6 @@ pub fn shrink_instructions(func: &mut Function, isa: &TargetIsa) {
                         encinfo.bytes(best_enc)
                     );
                 }
-
             }
             divert.apply(&func.dfg[inst]);
         }