qwjyh/endcap-sl-software-ri-generator
1
0
Fork 0
mirror of https://gitlab.cern.ch/wotsubo/endcap-sl-software-ri-generator.git synced 2025-04-25 06:06:00 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(XmlGitInfo): improve error msg

Browse source
This commit is contained in:
Wataru Otsubo 2025-04-22 16:39:15 +09:00
parent d6ee19e000
commit 42efcc7cf6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/io.rs
View file

@ -13,7 +13,7 @@ const ENVVAR_XML_GIT_SHA: &str = "XML_GIT_SHA";
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum XmlGitInfoError { pub enum XmlGitInfoError {
#[error("io error while getting xml git info: {msg} {source}")] #[error("io error while getting xml git info: {msg} {source}")]
IOError { GitCommandSpawnError {
msg: &'static str, msg: &'static str,
#[source] #[source]
source: io::Error, source: io::Error,
@ -25,8 +25,8 @@ pub enum XmlGitInfoError {
} }
impl XmlGitInfoError { impl XmlGitInfoError {
fn io_error(e: io::Error, msg: &'static str) -> Self { fn git_command_spawn_error(e: io::Error, msg: &'static str) -> Self {
XmlGitInfoError::IOError { msg, source: e } XmlGitInfoError::GitCommandSpawnError { msg, source: e }
} }
} }
@ -44,7 +44,7 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
.args(["describe", "--always", "--dirty"]) .args(["describe", "--always", "--dirty"])
.current_dir(xml_path.parent().unwrap()) .current_dir(xml_path.parent().unwrap())
.output() .output()
.map_err(|e| XmlGitInfoError::io_error(e, "git describe"))?; .map_err(|e| XmlGitInfoError::git_command_spawn_error(e, "git describe"))?;
let describe = if out_describe.status.success() { let describe = if out_describe.status.success() {
String::from_utf8_lossy(&out_describe.stdout) String::from_utf8_lossy(&out_describe.stdout)
.trim() .trim()
@ -71,7 +71,7 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
.args(["log", "-1", "--pretty=format:'%cI'"]) .args(["log", "-1", "--pretty=format:'%cI'"])
.current_dir(xml_path.parent().unwrap()) .current_dir(xml_path.parent().unwrap())
.output() .output()
.map_err(|e| XmlGitInfoError::io_error(e, "git log (timestamp)"))?; .map_err(|e| XmlGitInfoError::git_command_spawn_error(e, "git log (timestamp)"))?;
let timestamp = if timestamp_out.status.success() { let timestamp = if timestamp_out.status.success() {
String::from_utf8_lossy(&timestamp_out.stdout) String::from_utf8_lossy(&timestamp_out.stdout)
.trim() .trim()
@ -98,7 +98,7 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
.args(["rev-parse", "HEAD"]) .args(["rev-parse", "HEAD"])
.current_dir(xml_path.parent().unwrap()) .current_dir(xml_path.parent().unwrap())
.output() .output()
.map_err(|e| XmlGitInfoError::io_error(e, "git rev-parse (sha)"))?; .map_err(|e| XmlGitInfoError::git_command_spawn_error(e, "git rev-parse (sha)"))?;
let git_sha = if sha.status.success() { let git_sha = if sha.status.success() {
String::from_utf8_lossy(&sha.stdout).trim().to_owned() String::from_utf8_lossy(&sha.stdout).trim().to_owned()
} else { } else {