From b95625af5abd54292c120fbf45f0609c4299d35c Mon Sep 17 00:00:00 2001 From: smtmfft Date: Sat, 7 Sep 2024 21:33:52 +0800 Subject: [PATCH] fix ci Signed-off-by: smtmfft --- pipeline/src/builder.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pipeline/src/builder.rs b/pipeline/src/builder.rs index 2107a64d..1cae7e2b 100644 --- a/pipeline/src/builder.rs +++ b/pipeline/src/builder.rs @@ -135,7 +135,13 @@ impl CommandBuilder { Ok(output) => { if output.status.success() { println!("Command succeeded with output: {:?}", output.stdout); - Some(String::from_utf8_lossy(&output.stdout).trim().to_string()) + if let Ok(out) = String::from_utf8(output.stdout) { + let out = out.trim(); + println!("Using {tool}: {out}"); + Some(PathBuf::from(out)) + } else { + None + } } else { eprintln!("Command failed with status: {}", output.status); None @@ -146,16 +152,6 @@ impl CommandBuilder { None } } - - let Ok(out) = String::from_utf8(stdout) else { - return None; - }; - - let out = out.trim(); - - println!("Using {tool}: {out}"); - - Some(PathBuf::from(out)) } pub fn new(meta: &Metadata, target: &str, toolchain: &str) -> Self {