mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
chore: fix formatting
somehow some formatting regressions snuck in despite previously being CI-clean on formatting. I suspect this might have to do with the Rust 1.93.1 bump that happened just recently, sometimes new versions of Rust introduce small formatting changes.
This commit is contained in:
parent
575efa6129
commit
414cff252f
3 changed files with 4 additions and 21 deletions
|
|
@ -133,12 +133,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
|
||||||
let git_rev = matches.value_of("git-rev");
|
let git_rev = matches.value_of("git-rev");
|
||||||
let semver: Option<[u8; 16]> = if let Some(git_describe_str) = matches.value_of("git-describe") {
|
let semver: Option<[u8; 16]> = if let Some(git_describe_str) = matches.value_of("git-describe") {
|
||||||
Some(
|
Some(git_describe_str.parse::<SemVer>().expect("git-describe format incorrect").into())
|
||||||
git_describe_str
|
|
||||||
.parse::<SemVer>()
|
|
||||||
.expect("git-describe format incorrect")
|
|
||||||
.into(),
|
|
||||||
)
|
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -516,12 +516,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
|
||||||
let git_rev = matches.value_of("git-rev");
|
let git_rev = matches.value_of("git-rev");
|
||||||
let semver: Option<[u8; 16]> = if let Some(git_describe_str) = matches.value_of("git-describe") {
|
let semver: Option<[u8; 16]> = if let Some(git_describe_str) = matches.value_of("git-describe") {
|
||||||
Some(
|
Some(git_describe_str.parse::<SemVer>().expect("git-describe format incorrect").into())
|
||||||
git_describe_str
|
|
||||||
.parse::<SemVer>()
|
|
||||||
.expect("git-describe format incorrect")
|
|
||||||
.into(),
|
|
||||||
)
|
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -19,16 +19,9 @@ pub(crate) fn generate_version(add_timestamp: bool, forced_version: Option<Strin
|
||||||
} else {
|
} else {
|
||||||
let cmd = format!("git describe --long --abbrev={}", GIT_ABBREV_LEN);
|
let cmd = format!("git describe --long --abbrev={}", GIT_ABBREV_LEN);
|
||||||
let output = if cfg!(target_os = "windows") {
|
let output = if cfg!(target_os = "windows") {
|
||||||
Command::new("cmd")
|
Command::new("cmd").args(["/C", &cmd]).output().expect("failed to execute process")
|
||||||
.args(["/C", &cmd])
|
|
||||||
.output()
|
|
||||||
.expect("failed to execute process")
|
|
||||||
} else {
|
} else {
|
||||||
Command::new("sh")
|
Command::new("sh").arg("-c").arg(&cmd).output().expect("failed to execute process")
|
||||||
.arg("-c")
|
|
||||||
.arg(&cmd)
|
|
||||||
.output()
|
|
||||||
.expect("failed to execute process")
|
|
||||||
};
|
};
|
||||||
output.stdout
|
output.stdout
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue