nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 18:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

option_env and commit_info

Browse Source
This commit is contained in:
csmoe 2018-02-21 13:13:39 +08:00
parent ef05a2d2f1
commit f82e935b96
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rustfmt-bin/build.rs
View File

@ -26,8 +26,8 @@ fn main() {
// 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!("{} ({} {})", channel(), hash.trim_right(), date),
match (channel(), commit_hash(), commit_date()) {
(channel, Some(hash), Some(date)) => format!("{} ({} {})", channel, hash.trim_right(), date),
_ => String::new(),
}
}

14
rustfmt-bin/src/main.rs
View File

@ -386,14 +386,14 @@ fn print_usage_to_stdout(opts: &Options, reason: &str) {
}
fn print_version() {
println!(
"rustfmt {}",
concat!(
env!("CARGO_PKG_VERSION"),
"-",
include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
)
let version_info = format!(
"{}{}{}",
option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"),
"-",
include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
);
println!("rustfmt {}", version_info);
}
fn determine_operation(matches: &Matches) -> FmtResult<Operation> {