itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8751

Browse Source 
8751: minor: standard snippet r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-05-07 18:47:05 +00:00 committed by GitHub
commit 1ec82d4bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/rust-analyzer/build.rs
View File

@ -51,16 +51,23 @@ fn rev() -> String {
} }
fn commit_hash() -> Option<String> { fn commit_hash() -> Option<String> {
output_to_string("git rev-parse --short HEAD") exec("git rev-parse --short HEAD").ok()
} }
fn build_date() -> Option<String> { fn build_date() -> Option<String> {
output_to_string("date -u +%Y-%m-%d") exec("date -u +%Y-%m-%d").ok()
} }
fn output_to_string(command: &str) -> Option<String> { fn exec(command: &str) -> std::io::Result<String> {
let args = command.split_ascii_whitespace().collect::<Vec<_>>(); let args = command.split_ascii_whitespace().collect::<Vec<_>>();
let output = Command::new(args[0]).args(&args[1..]).output().ok()?; let output = Command::new(args[0]).args(&args[1..]).output()?;
let stdout = String::from_utf8(output.stdout).ok()?; if !output.status.success() {
Some(stdout.trim().to_string()) return Err(std::io::Error::new(
std::io::ErrorKind::InvalidData,
format!("command {:?} returned non-zero code", command,),
));
}
let stdout = String::from_utf8(output.stdout)
.map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err))?;
Ok(stdout.trim().to_string())
} }