meta: bump rustfmt version to 1.4.23

[rust.git] / build.rs

diff --git a/build.rs b/build.rs
index 7fcc5af34d323c8297d71565fe62f87e8294e461..e7b1e1b854c07025ac06e9391859c2c1c7fd63af 100644 (file)
--- a/build.rs
+++ b/build.rs
@@ -1,21 +1,16 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::env;
 use std::fs::File;
 use std::io::Write;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 fn main() {
-    println!("cargo:rerun-if-changed=.git/HEAD");
+    // Only check .git/HEAD dirty status if it exists - doing so when
+    // building dependent crates may lead to false positives and rebuilds
+    if Path::new(".git/HEAD").exists() {
+        println!("cargo:rerun-if-changed=.git/HEAD");
+    }
+
     println!("cargo:rerun-if-env-changed=CFG_RELEASE_CHANNEL");
 
     let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
@@ -30,9 +25,7 @@ fn main() {
 // (git not installed or if this is not a git repository) just return an empty string.
 fn commit_info() -> String {
     match (channel(), commit_hash(), commit_date()) {
-        (channel, Some(hash), Some(date)) => {
-            format!("{} ({} {})", channel, hash.trim_right(), date)
-        }
+        (channel, Some(hash), Some(date)) => format!("{} ({} {})", channel, hash.trim_end(), date),
         _ => String::new(),
     }
 }