]> git.lizzy.rs Git - rust.git/commit - src/tools/rust-analyzer
Rollup merge of #76800 - jyn514:usage, r=Mark-Simulacrum
authorRalf Jung <post@ralfj.de>
Sun, 20 Sep 2020 10:08:15 +0000 (12:08 +0200)
committerGitHub <noreply@github.com>
Sun, 20 Sep 2020 10:08:15 +0000 (12:08 +0200)
commitb603143c9e8f535219d7ba348d7efaf634dd0071
tree4cafa892d1b11a32a5ffbae8040e6fcb77020826
parent2911b8cb30cf4fed41a6d6dba4fb0076b6a82e93
parentc35ce3ff170333d11ccf89e75dc87c49f44a570a
Rollup merge of #76800 - jyn514:usage, r=Mark-Simulacrum

Don't generate bootstrap usage unless it's needed

Previously, `x.py` would unconditionally run `x.py build` to get the
help message. After https://github.com/rust-lang/rust/issues/76165,
when checking the CI stage was moved into `Config`, that would cause an
assertion failure (but only only in CI!):

```
thread 'main' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `2`', src/bootstrap/config.rs:619:49
```

This changes bootstrap to only generate a help message when it needs
to (when someone passes `--help`).

r? @Mark-Simulacrum
This should fix the CI failures in https://github.com/rust-lang/rust/pull/76797 and https://github.com/rust-lang/rust/pull/75991.