From cb75662ae7d97b99821b2145ccc239a18878eb47 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 4 Aug 2024 10:42:08 -0700 Subject: [PATCH 1/2] Check exit status of git commands spawned by build script --- build.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.rs b/build.rs index 8e1ed287159..696c713d726 100644 --- a/build.rs +++ b/build.rs @@ -43,15 +43,16 @@ fn commit_hash() -> Option { .args(["rev-parse", "HEAD"]) .output() .ok()?; - let mut stdout = String::from_utf8(output.stdout).ok()?; + let mut stdout = output.status.success().then_some(output.stdout)?; stdout.truncate(10); - Some(stdout) + String::from_utf8(stdout).ok() } fn commit_date() -> Option { - Command::new("git") + let output = Command::new("git") .args(["log", "-1", "--date=short", "--pretty=format:%cd"]) .output() - .ok() - .and_then(|r| String::from_utf8(r.stdout).ok()) + .ok()?; + let stdout = output.status.success().then_some(output.stdout)?; + String::from_utf8(stdout).ok() } From ffb11f00a2be1dd8cba87d85e7bcc4783af235d7 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 4 Aug 2024 10:44:55 -0700 Subject: [PATCH 2/2] Print empty commit info without trailing hyphen --- src/bin/main.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bin/main.rs b/src/bin/main.rs index 6959f56ccc7..1185454c8e7 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -450,13 +450,14 @@ are included as out of line modules from `src/lib.rs`." } fn print_version() { - let version_info = format!( - "{}-{}", - option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"), - include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt")) - ); + let version_number = option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"); + let commit_info = include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt")); - println!("rustfmt {version_info}"); + if commit_info.is_empty() { + println!("rustfmt {version_number}"); + } else { + println!("rustfmt {version_number}-{commit_info}"); + } } fn determine_operation(matches: &Matches) -> Result {