Auto merge of #20160 - emilio:formatted-style, r=xidorn

style: Rustfmt bindings on automation, and locally under an env variable.

Bug: 1432153
Reviewed-by: xidorn
MozReview-Commit-ID: HJ9J5NtYVk2

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20160)
<!-- Reviewable:end -->

components/style/Cargo.toml

@@ -78,7 +78,7 @@ kernel32-sys = "0.2"
 [build-dependencies]
 lazy_static = "1"
 log = "0.3"
-bindgen = { version = "0.32.2", optional = true }
+bindgen = { version = "0.32.3", optional = true }
 regex = {version = "0.2", optional = true}
 walkdir = "1.0"
 toml = {version = "0.2.1", optional = true, default-features = false}

components/style/build_gecko.rs

@@ -204,15 +204,25 @@ mod bindings {
 
             // Disable rust unions, because we replace some types inside of
             // them.
-            //
-            // FIXME(emilio, bug 1432153): Make the bindings rustfmt'd on
-            // automation.
             let mut builder = Builder::default()
-                .rustfmt_bindings(false)
                 .rust_target(RustTarget::Stable_1_0);
+            let rustfmt_path = env::var_os("MOZ_AUTOMATION").and_then(|_| {
+                env::var_os("TOOLTOOL_DIR")
+            }).map(PathBuf::from);
+
+            builder = match rustfmt_path {
+                Some(path) => {
+                    builder.with_rustfmt(path.join("rustc").join("bin").join("rustfmt"))
+                },
+                None => {
+                    builder.rustfmt_bindings(env::var_os("STYLO_RUSTFMT_BINDINGS").is_some())
+                }
+            };
+
             for dir in SEARCH_PATHS.iter() {
                 builder = builder.clang_arg("-I").clang_arg(dir.to_str().unwrap());
             }
+
             builder = builder.include(add_include("mozilla-config.h"));
 
             if env::var("CARGO_FEATURE_GECKO_DEBUG").is_ok() {