Check exit status of subcommands spawned by rustc_tools_util

This commit is contained in:
David Tolnay 2024-08-04 11:09:18 -07:00
parent 7ac242c3d0
commit 234ea1fcd9
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82

View File

@ -1,5 +1,7 @@
#![cfg_attr(feature = "deny-warnings", deny(warnings))]
use std::str;
/// This macro creates the version string during compilation from the
/// current environment
#[macro_export]
@ -101,49 +103,45 @@ impl std::fmt::Debug for VersionInfo {
#[must_use]
pub fn get_commit_hash() -> Option<String> {
std::process::Command::new("git")
let output = std::process::Command::new("git")
.args(["rev-parse", "--short", "HEAD"])
.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()
}
#[must_use]
pub fn get_commit_date() -> Option<String> {
std::process::Command::new("git")
let output = std::process::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()
}
#[must_use]
pub fn get_channel() -> String {
match std::env::var("CFG_RELEASE_CHANNEL") {
Ok(channel) => channel,
Err(_) => {
// if that failed, try to ask rustc -V, do some parsing and find out
match std::process::Command::new("rustc")
.arg("-V")
.output()
.ok()
.and_then(|r| String::from_utf8(r.stdout).ok())
{
Some(rustc_output) => {
if rustc_output.contains("beta") {
String::from("beta")
} else if rustc_output.contains("stable") {
String::from("stable")
} else {
// default to nightly if we fail to parse
String::from("nightly")
}
},
// default to nightly
None => String::from("nightly"),
}
},
if let Ok(channel) = std::env::var("CFG_RELEASE_CHANNEL") {
return channel;
}
// if that failed, try to ask rustc -V, do some parsing and find out
if let Ok(output) = std::process::Command::new("rustc").arg("-V").output() {
if output.status.success() {
if let Ok(rustc_output) = str::from_utf8(&output.stdout) {
if rustc_output.contains("beta") {
return String::from("beta");
} else if rustc_output.contains("stable") {
return String::from("stable");
}
}
}
}
// default to nightly
String::from("nightly")
}
#[cfg(test)]