Simplify --version info

rust-lang · May 25, 2017 · a7b8dcc · a7b8dcc
1 parent 393ba27
commit a7b8dcc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,9 34,6 @@ log = "0.3"
 env_logger = "0.4"
 getopts = "0.2"
 
-[build-dependencies]
-walkdir = "1.0.3"
-
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.11"
 

diff --git a/build.rs b/build.rs
@@ -1,57 1,50 @@
-extern crate walkdir;
 // 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::Path;
 use std::path::PathBuf;
 use std::process::Command;
 
-use walkdir::WalkDir;
 
 fn main() {
- let out_dir = env::var("OUT_DIR").unwrap();
- let dest_path = Path::new(&out_dir).join("git_info.rs");
- let mut f = File::create(&dest_path).unwrap();
  let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
 
- writeln!(f,
- "const COMMIT_HASH: Option<&'static str> = {:?};",
- git_head_sha1())
- .unwrap();
- writeln!(f,
- "const WORKTREE_CLEAN: Option<bool> = {:?};",
- git_tree_is_clean())
  File::create(out_dir.join("commit-info.txt"))
  .unwrap()
  .write_all(commit_info().as_bytes())
  .unwrap();
 }
 
- // cargo:rerun-if-changed requires one entry per individual file.
- for entry in WalkDir::new("src") {
- let entry = entry.unwrap();
- println!("cargo:rerun-if-changed={}", entry.path().display());
 // Try to get hash and date of the last commit on a best effort basis. If anything goes wrong
 // (git not installed or if this is not a git repository) just return an empty string.
 fn commit_info() -> String {
  match (commit_hash(), commit_date()) {
  (Some(hash), Some(date)) => format!(" ({} {})", hash.trim_right(), date),
  _ => String::new(),
  }
 }
 
-// Returns `None` if git is not available.
-fn git_head_sha1() -> Option<String> {
 fn commit_hash() -> Option<String> {
  Command::new("git")
- .arg("rev-parse")
- .arg("--short")
- .arg("HEAD")
  .args(&["rev-parse", "--short", "HEAD"])
  .output()
  .ok()
- .and_then(|o| String::from_utf8(o.stdout).ok())
- .map(|mut s| {
- let len = s.trim_right().len();
- s.truncate(len);
- s
- })
  .and_then(|r| String::from_utf8(r.stdout).ok())
 }
 
-// Returns `None` if git is not available.
-fn git_tree_is_clean() -> Option<bool> {
 fn commit_date() -> Option<String> {
  Command::new("git")
- .arg("status")
- .arg("--porcelain")
- .arg("--untracked-files=no")
  .args(&["log", "-1", "--date=short", "--pretty=format:�"])
  .output()
  .ok()
- .map(|o| o.stdout.is_empty())
  .and_then(|r| String::from_utf8(r.stdout).ok())
 }
diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs
@@ -29,12 29,6 @@ use std::str::FromStr;
 
 use getopts::{Matches, Options};
 
-// Include git commit hash and worktree status; contents are like
-// const COMMIT_HASH: Option<&'static str> = Some("c31a366");
-// const WORKTREE_CLEAN: Option<bool> = Some(false);
-// with `None` if running git failed, eg if it is not installed.
-include!(concat!(env!("OUT_DIR"), "/git_info.rs"));
-
 type FmtError = Box<error::Error Send Sync>;
 type FmtResult<T> = std::result::Result<T, FmtError>;
 
@@ -365,13 359,9 @@ fn print_usage(opts: &Options, reason: &str) {
 }
 
 fn print_version() {
- println!("{} ({}{})",
- option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"),
- COMMIT_HASH.unwrap_or("git commit unavailable"),
- match WORKTREE_CLEAN {
- Some(false) => " worktree dirty",
- _ => "",
- });
  println!("{}-nightly{}",
  env!("CARGO_PKG_VERSION"),
  include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt")))
 }
 
 fn determine_operation(matches: &Matches) -> FmtResult<Operation> {