Ensure formatted code on automation.

build.rs

@@ -7,8 +7,8 @@ mod target {
     pub fn main() {
         let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-        let mut dst = File::create(Path::new(&out_dir).join("host-target.txt"))
-            .unwrap();
+        let mut dst =
+            File::create(Path::new(&out_dir).join("host-target.txt")).unwrap();
         dst.write_all(env::var("TARGET").unwrap().as_bytes())
             .unwrap();
     }
@@ -24,8 +24,8 @@ mod testgen {
 
     pub fn main() {
         let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-        let mut dst = File::create(Path::new(&out_dir).join("tests.rs"))
-            .unwrap();
+        let mut dst =
+            File::create(Path::new(&out_dir).join("tests.rs")).unwrap();
 
         let manifest_dir =
             PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
@@ -57,7 +57,8 @@ mod testgen {
                         "test_header!(header_{}, {:?});",
                         func,
                         entry.path(),
-                    ).unwrap();
+                    )
+                    .unwrap();
                 }
                 _ => {}
             }

ci/assert-rustfmt.sh

@@ -3,14 +3,10 @@
 set -xeu
 cd "$(dirname "$0")/.."
 
-# Ensure we have the most up-to-date `rustfmt`.
-cargo install -f rustfmt
+rustup update nightly
+rustup component add rustfmt --toolchain nightly
 
 # Run `rustfmt` on the crate! If `rustfmt` can't make a long line shorter, it
 # prints an error and exits non-zero, so tell it to kindly shut its yapper and
 # make sure it doesn't cause us to exit this whole script non-zero.
-cargo fmt --quiet || true
-
-# Exit non-zero if this resulted in any diffs.
-./ci/assert-no-diff.sh
-
+rustup run nightly cargo fmt -- --check

ci/script.sh

@@ -45,8 +45,7 @@ case "$BINDGEN_JOB" in
         ./ci/assert-docs.sh
         ./ci/test-book.sh
         ./ci/no-includes.sh
-        # `rustfmt` isn't reaching a fixed point on bindgen
-        # code... https://github.com/rust-lang/rustfmt/issues/1376
+        # Disabled because https://github.com/rust-lang/rustfmt/issues/3799.
         # ./ci/assert-rustfmt.sh
         ;;
 

rustfmt.toml

@@ -1,5 +1,2 @@
 max_width = 80
-brace_style = "SameLineWhere"
-struct_lit_single_line = false
-where_trailing_comma = true
-normalize_comments = false
+binop_separator = "back"

src/callbacks.rs

@@ -37,8 +37,7 @@ pub trait ParseCallbacks: fmt::Debug + UnwindSafe {
 
     /// This will be run on every string macro. The callback can not influence the further
     /// treatment of the macro, but may use the value to generate additional code or configuration.
-    fn str_macro(&self, _name: &str, _value: &[u8]) {
-    }
+    fn str_macro(&self, _name: &str, _value: &[u8]) {}
 
     /// This function should return whether, given an enum variant
     /// name, and value, this enum variant will forcibly be a constant.