diff options
| author | DebugSteven <debugsteven@gmail.com> | 2022-12-07 14:00:40 -0700 |
|---|---|---|
| committer | DebugSteven <debugsteven@gmail.com> | 2022-12-31 11:38:44 -0700 |
| commit | f50ad6cd8ce48c8f159bee064ba9ae9dd28f6868 (patch) | |
| tree | 6e2b7c9cc0884604f87a16f78b1608e3713c13e5 | |
| parent | 430ea8d440f5fc22dec7c4b6bda0536ae38baa00 (diff) | |
| download | rust-f50ad6cd8ce48c8f159bee064ba9ae9dd28f6868.tar.gz rust-f50ad6cd8ce48c8f159bee064ba9ae9dd28f6868.zip | |
rename wrapper-version argument for x to differentiate it from the bootstrap version
| -rw-r--r-- | src/tools/tidy/src/x_version.rs | 2 | ||||
| -rw-r--r-- | src/tools/x/src/main.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/tidy/src/x_version.rs b/src/tools/tidy/src/x_version.rs index f0c7a308cfa..dddf72f4747 100644 --- a/src/tools/tidy/src/x_version.rs +++ b/src/tools/tidy/src/x_version.rs @@ -3,7 +3,7 @@ use std::io::ErrorKind; use std::process::{Command, Stdio}; pub fn check(bad: &mut bool) { - let result = Command::new("x").arg("--version").stdout(Stdio::piped()).spawn(); + let result = Command::new("x").arg("--wrapper-version").stdout(Stdio::piped()).spawn(); let child = match result { Ok(child) => child, Err(e) => match e.kind() { diff --git a/src/tools/x/src/main.rs b/src/tools/x/src/main.rs index db5d03710d7..01f7187851e 100644 --- a/src/tools/x/src/main.rs +++ b/src/tools/x/src/main.rs @@ -53,7 +53,7 @@ fn exec_or_status(command: &mut Command) -> io::Result<ExitStatus> { fn main() { match env::args().skip(1).next().as_deref() { - Some("--version") => { + Some("--wrapper-version") => { let version = env!("CARGO_PKG_VERSION"); println!("{}", version); return; |
