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.

cranelift/format-all.sh

@@ -8,4 +8,4 @@ cd $(dirname "$0")
 # Make sure we can find rustfmt.
 export PATH="$PATH:$HOME/.cargo/bin"
 
-exec cargo fmt --all -- "$@"
+exec cargo +stable fmt --all -- "$@"

cranelift/src/cat.rs

@@ -18,12 +18,8 @@ pub fn run(files: &[String]) -> CommandResult {
 }
 
 fn cat_one(filename: &str) -> CommandResult {
-    let buffer = read_to_string(&filename).map_err(
-        |e| format!("{}: {}", filename, e),
-    )?;
-    let items = parse_functions(&buffer).map_err(
-        |e| format!("{}: {}", filename, e),
-    )?;
+    let buffer = read_to_string(&filename).map_err(|e| format!("{}: {}", filename, e))?;
+    let items = parse_functions(&buffer).map_err(|e| format!("{}: {}", filename, e))?;
 
     for (idx, func) in items.into_iter().enumerate() {
         if idx != 0 {

cranelift/src/compile.rs

@@ -1,10 +1,10 @@
 //! CLI tool to read Cretonne IR files and compile them into native code.
 
 use capstone::prelude::*;
+use cretonne_codegen::Context;
 use cretonne_codegen::isa::TargetIsa;
 use cretonne_codegen::print_errors::pretty_error;
 use cretonne_codegen::settings::FlagsOrIsa;
-use cretonne_codegen::Context;
 use cretonne_codegen::{binemit, ir};
 use cretonne_reader::parse_test;
 use std::path::Path;
@@ -80,9 +80,7 @@ fn handle_module(
     name: &str,
     fisa: FlagsOrIsa,
 ) -> Result<(), String> {
-    let buffer = read_to_string(&path).map_err(
-        |e| format!("{}: {}", name, e),
-    )?;
+    let buffer = read_to_string(&path).map_err(|e| format!("{}: {}", name, e))?;
     let test_file = parse_test(&buffer).map_err(|e| format!("{}: {}", name, e))?;
 
     // If we have an isa from the command-line, use that. Otherwise if the
@@ -154,12 +152,10 @@ fn get_disassembler(isa: &TargetIsa) -> Result<Capstone, String> {
             }
         }
         "arm32" => Capstone::new().arm().mode(arch::arm::ArchMode::Arm).build(),
-        "arm64" => {
-            Capstone::new()
-                .arm64()
-                .mode(arch::arm64::ArchMode::Arm)
-                .build()
-        }
+        "arm64" => Capstone::new()
+            .arm64()
+            .mode(arch::arm64::ArchMode::Arm)
+            .build(),
         _ => return Err(String::from("Unknown ISA")),
     };
 

cranelift/src/cton-util.rs

@@ -1,14 +1,8 @@
 #![deny(trivial_numeric_casts)]
 #![warn(unused_import_braces, unstable_features, unused_extern_crates)]
-#![cfg_attr(feature="cargo-clippy", warn(
-                float_arithmetic,
-                mut_mut,
-                nonminimal_bool,
-                option_map_unwrap_or,
-                option_map_unwrap_or_else,
-                unicode_not_nfc,
-                use_self,
-                ))]
+#![cfg_attr(feature = "cargo-clippy",
+            warn(float_arithmetic, mut_mut, nonminimal_bool, option_map_unwrap_or,
+                 option_map_unwrap_or_else, unicode_not_nfc, use_self))]
 
 #[macro_use]
 extern crate cfg_if;
@@ -134,9 +128,7 @@ fn cton_util() -> CommandResult {
         );
 
         #[cfg(not(feature = "wasm"))]
-        let result = Err(
-            "Error: cton-util was compiled without wasm support.".to_owned(),
-        );
+        let result = Err("Error: cton-util was compiled without wasm support.".to_owned());
 
         result
     } else {

cranelift/src/print_cfg.rs

@@ -19,12 +19,8 @@ pub fn run(files: &[String]) -> CommandResult {
 }
 
 fn print_cfg(filename: &str) -> CommandResult {
-    let buffer = read_to_string(filename).map_err(
-        |e| format!("{}: {}", filename, e),
-    )?;
-    let items = parse_functions(&buffer).map_err(
-        |e| format!("{}: {}", filename, e),
-    )?;
+    let buffer = read_to_string(filename).map_err(|e| format!("{}: {}", filename, e))?;
+    let items = parse_functions(&buffer).map_err(|e| format!("{}: {}", filename, e))?;
 
     for (idx, func) in items.into_iter().enumerate() {
         if idx != 0 {

cranelift/src/rsfilecheck.rs

@@ -22,14 +22,14 @@ pub fn run(files: &[String], verbose: bool) -> CommandResult {
     }
 
     let mut buffer = String::new();
-    io::stdin().read_to_string(&mut buffer).map_err(|e| {
-        format!("stdin: {}", e)
-    })?;
+    io::stdin()
+        .read_to_string(&mut buffer)
+        .map_err(|e| format!("stdin: {}", e))?;
 
     if verbose {
-        let (success, explain) = checker.explain(&buffer, NO_VARIABLES).map_err(
-            |e| e.to_string(),
-        )?;
+        let (success, explain) = checker
+            .explain(&buffer, NO_VARIABLES)
+            .map_err(|e| e.to_string())?;
         print!("{}", explain);
         if success {
             println!("OK");
@@ -37,27 +37,25 @@ pub fn run(files: &[String], verbose: bool) -> CommandResult {
         } else {
             Err("Check failed".to_string())
         }
-    } else if checker.check(&buffer, NO_VARIABLES).map_err(
-        |e| e.to_string(),
-    )?
+    } else if checker
+        .check(&buffer, NO_VARIABLES)
+        .map_err(|e| e.to_string())?
     {
         Ok(())
     } else {
-        let (_, explain) = checker.explain(&buffer, NO_VARIABLES).map_err(
-            |e| e.to_string(),
-        )?;
+        let (_, explain) = checker
+            .explain(&buffer, NO_VARIABLES)
+            .map_err(|e| e.to_string())?;
         print!("{}", explain);
         Err("Check failed".to_string())
     }
 }
 
 fn read_checkfile(filename: &str) -> Result<Checker, String> {
-    let buffer = read_to_string(&filename).map_err(
-        |e| format!("{}: {}", filename, e),
-    )?;
+    let buffer = read_to_string(&filename).map_err(|e| format!("{}: {}", filename, e))?;
     let mut builder = CheckerBuilder::new();
-    builder.text(&buffer).map_err(
-        |e| format!("{}: {}", filename, e),
-    )?;
+    builder
+        .text(&buffer)
+        .map_err(|e| format!("{}: {}", filename, e))?;
     Ok(builder.finish())
 }

cranelift/test-all.sh

@@ -23,9 +23,19 @@ function banner {
 }
 
 # Run rustfmt if we have it.
-if $topdir/check-rustfmt.sh; then
-    banner "Rust formatting"
-    $topdir/format-all.sh --write-mode=diff
+banner "Rust formatting"
+if command -v rustfmt > /dev/null; then
+    # In newer versions of rustfmt, replace --write-mode=diff with --check.
+    if ! $topdir/format-all.sh --write-mode=diff ; then
+        echo "Formatting diffs detected! Run \"cargo fmt --all\" to correct."
+        exit 1
+    fi
+else
+    echo "rustfmt not available; formatting not checked!"
+    echo
+    echo "If you are using rustup, rustfmt can be installed via"
+    echo "\"rustup component add --toolchain=stable rustfmt-preview\", or see"
+    echo "https://github.com/rust-lang-nursery/rustfmt for more information."
 fi
 
 # Check if any Python files have changed since we last checked them.