diff options
| author | Takayuki Maeda <takoyaki0316@gmail.com> | 2023-11-09 11:36:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 11:36:54 +0900 |
| commit | f5195c52bb9affdcba68165e2e0bdbc63e6e580c (patch) | |
| tree | 4b70853d0b5833ad99e75e214c352494a4ea953f | |
| parent | e603f4491caffc0ef0294b9a25d5d5ca0c1f469d (diff) | |
| parent | 622be2d138e2849e0b9ea9afb2a83f31ba030be1 (diff) | |
| download | rust-f5195c52bb9affdcba68165e2e0bdbc63e6e580c.tar.gz rust-f5195c52bb9affdcba68165e2e0bdbc63e6e580c.zip | |
Rollup merge of #117724 - Kobzol:shim-error-message, r=onur-ozkan
Restore rustc shim error message Fixes: https://github.com/rust-lang/rust/pull/117595#discussion_r1382482249 The error message was originally introduced in https://github.com/rust-lang/rust/pull/111323, and subsequently broken by my change in https://github.com/rust-lang/rust/pull/116448. r? ``@onur-ozkan``
| -rw-r--r-- | src/bootstrap/src/bin/rustc.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/src/utils/bin_helpers.rs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/src/bin/rustc.rs b/src/bootstrap/src/bin/rustc.rs index 3041fd37ac8..e3c010eb49c 100644 --- a/src/bootstrap/src/bin/rustc.rs +++ b/src/bootstrap/src/bin/rustc.rs @@ -32,6 +32,9 @@ fn main() { let args = env::args_os().skip(1).collect::<Vec<_>>(); let arg = |name| args.windows(2).find(|args| args[0] == name).and_then(|args| args[1].to_str()); + // We don't use the stage in this shim, but let's parse it to make sure that we're invoked + // by bootstrap, or that we provide a helpful error message if not. + bin_helpers::parse_rustc_stage(); let verbose = bin_helpers::parse_rustc_verbose(); // Detect whether or not we're a build script depending on whether --target diff --git a/src/bootstrap/src/utils/bin_helpers.rs b/src/bootstrap/src/utils/bin_helpers.rs index b9177c490ac..ab41a6b9600 100644 --- a/src/bootstrap/src/utils/bin_helpers.rs +++ b/src/bootstrap/src/utils/bin_helpers.rs @@ -18,7 +18,6 @@ pub(crate) fn parse_rustc_verbose() -> usize { /// Parses the value of the "RUSTC_STAGE" environment variable and returns it as a `String`. /// /// If "RUSTC_STAGE" was not set, the program will be terminated with 101. -#[allow(unused)] pub(crate) fn parse_rustc_stage() -> String { std::env::var("RUSTC_STAGE").unwrap_or_else(|_| { // Don't panic here; it's reasonable to try and run these shims directly. Give a helpful error instead. |