Skip to content

Commit

Permalink
handle error case where --wrapper-version argument doesn't exist
Browse files Browse the repository at this point in the history
  • Loading branch information
DebugSteven committed Jan 1, 2023
1 parent f50ad6c commit 5e67ce6
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions src/tools/tidy/src/x_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,29 @@ use std::process::{Command, Stdio};

pub fn check(bad: &mut bool) {
let result = Command::new("x").arg("--wrapper-version").stdout(Stdio::piped()).spawn();
let child = match result {
Ok(child) => child,
Err(e) => match e.kind() {
// This runs the command inside a temporarily directory.
// This allows us to compare output of result to see if `--wrapper-version` is not a recognized argument to x.
let temp_result = Command::new("x").arg("--wrapper-version").current_dir(std::env::temp_dir()).stdout(Stdio::piped()).spawn();

let (child, temp_child) = match (result, temp_result) {
(Ok(child), Ok(temp_child)) => (child, temp_child),
// what would it mean if the temp cmd error'd?
(Ok(_child), Err(_e)) => todo!(),
(Err(e), _) => match e.kind() {
ErrorKind::NotFound => return,
_ => return tidy_error!(bad, "failed to run `x`: {}", e),
},
};

let output = child.wait_with_output().unwrap();
let temp_output = temp_child.wait_with_output().unwrap();

if output != temp_output {
return tidy_error!(
bad,
"Current version of x does not support the `--wrapper-version` argument\nConsider updating to the newer version of x by running `cargo install --path src/tools/x`"
)
}

if output.status.success() {
let version = String::from_utf8_lossy(&output.stdout);
Expand Down

0 comments on commit 5e67ce6

Please sign in to comment.