frx/altherego
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust to submodules

Browse Source
This commit is contained in:
Aleksandr Trushkin
2023-02-26 19:05:46 +03:00
parent d83af3e6cd
commit a657174b56
4 changed files with 9 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.rs
View File

@ -2,11 +2,11 @@ use std::env;
fn main() {
let rev = get_value_from_env("GIT_VERSION")
.or_else(|| get_value_from_command("git", &["rev-parse", "--short", "HEAD"]))
.or_else(|| get_value_from_command("git", ["rev-parse", "--short", "HEAD"]))
.unwrap_or_else(|| "unknown".to_owned());
let branch = get_value_from_env("GIT_BRANCH")
.or_else(|| get_value_from_command("git", &["rev-parse", "--abbrev-ref", "HEAD"]))
.or_else(|| get_value_from_command("git", ["rev-parse", "--abbrev-ref", "HEAD"]))
.unwrap_or_else(|| "unknown".to_owned());
println!("cargo:rustc-env=GIT_REVISION={}", rev);
@ -15,7 +15,7 @@ fn main() {
}
fn get_value_from_env(key: &str) -> Option<String> {
env::var(key).map_or_else(|_| None, |v| Some(v))
env::var(key).map_or_else(|_| None, Some)
}
fn get_value_from_command<I: IntoIterator<Item = S>, S: AsRef<std::ffi::OsStr>>(