diff options
| author | bors <bors@rust-lang.org> | 2022-08-01 15:40:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-01 15:40:43 +0000 |
| commit | c9e134e1b609e571f4d7d18f91f0ccb1a0cb685d (patch) | |
| tree | b38a9b292ee26403c80808d1c4cb74d67c011b8b /src/tools | |
| parent | dcb444af0a417766dde9b7b8f537fa1ba1568daf (diff) | |
| parent | 058ea7a955982a7bcb3ba72c1b644558241c96e4 (diff) | |
Auto merge of #100024 - matthiaskrgr:rollup-36ab4wx, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #99340 (Fix ICE in Definitions::create_def) - #99629 (Improve `cannot move out of` error message) - #99864 (bootstrap: don't emit warn about duplicated deps with same/different features if some of sets actually empty) - #99911 (Remove some uses of `guess_head_span`) - #99976 (Make Rustdoc exit with correct error code when scraping examples from invalid files) - #100003 (Improve size assertions.) - #100012 (Avoid `Ty` to `String` conversions) - #100020 (better error when python is not found in x - issue #99648) Failed merges: - #99994 (Replace `guess_head_span` with `opt_span`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/x/src/main.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/x/src/main.rs b/src/tools/x/src/main.rs index 57d548f313d..9187c3551d7 100644 --- a/src/tools/x/src/main.rs +++ b/src/tools/x/src/main.rs @@ -41,9 +41,9 @@ fn python() -> &'static str { } else if python2 { PYTHON2 } else { - // We would have returned early if we found that python is installed ... - // maybe this should panic with an error instead? - PYTHON + // Python was not found on path, so exit + eprintln!("Unable to find python in your PATH. Please check it is installed."); + process::exit(1); } } |
