x setup no longer goes through all setup steps before checking if config.toml exists

[jyn514]

I tried this code:

x setup

I expected to see this happen: x setup prompts me to choose a profile and goes through the hook, vscode, etc. before exiting with an error.

Instead, this happened: x setup prompts me to choose a profile and immediately exits before running anything else:

; x setup
Building bootstrap
    Finished dev [unoptimized] target(s) in 0.14s
warning: `download-rustc` is enabled, but there are changes to compiler/ or library/
Welcome to the Rust project! What do you want to do with x.py?
a) library: Contribute to the standard library
b) compiler: Contribute to the compiler itself
c) codegen: Contribute to the compiler, and also modify LLVM or codegen
d) tools: Contribute to tools which depend on the compiler, but do not modify it directly (e.g. rustdoc, clippy, miri)
e) user: Install Rust from source
f) none: Do not modify `config.toml`
Please choose one (a/b/c/d/e/f): b

To get started, try one of the following commands:
- `x.py check`
- `x.py build`
- `x.py test`
For more suggestions, see https://rustc-dev-guide.rust-lang.org/building/suggested.html

error: you asked `x.py` to setup a new config file, but one already exists at `config.toml`
help: try adding `profile = "compiler"` at the top of config.toml
note: this will use the configuration in /home/jyn/src/rust2/src/bootstrap/defaults/config.compiler.toml
Build completed unsuccessfully in 0:00:01

This is a recent regression, I tested this at one point and it did work.

Meta

HEAD is branched from 9693b17

[albertlarsan68]

I think this is good behavior, since the subcommands allow specific actions.
I think the check should happen at the start, and print a warning pointing to the different subcommands available.

[jyn514]

Hmm, ok, you're imagining something like this, where there's not an interactive prompt before the error?

; x setup
Building bootstrap
    Finished dev [unoptimized] target(s) in 0.14s
error: you asked `x.py` to setup a new config file, but one already exists at `config.toml`
help: to pick a specific profile, try adding `profile = "..."` at the top of config.toml
note: this will use the configuration in /home/jyn/src/rust2/src/bootstrap/defaults/config.compiler.toml
help: to see a list of available `setup` commands, run `x setup --help --verbose`

That seems like a good change 👍