]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #76631 - jyn514:x.py-setup, r=Mark-Simulacrum
authorRalf Jung <post@ralfj.de>
Sat, 26 Sep 2020 10:58:13 +0000 (12:58 +0200)
committerGitHub <noreply@github.com>
Sat, 26 Sep 2020 10:58:13 +0000 (12:58 +0200)
Add `x.py setup`

Closes #76503.

- Suggest `x.py setup` if config.toml doesn't exist yet
- Prompt for a profile if not given on the command line
- Print the configuration that will be used
- Print helpful starting commands after setup
- Link to the dev-guide after finishing

1  2 
src/bootstrap/CHANGELOG.md
src/bootstrap/bin/main.rs
src/bootstrap/config.rs
src/bootstrap/flags.rs

Simple merge
Simple merge
index 53fef7a838df62dc11152491dea44a32ac0d1719,46a9d989652e93af5405d6728df9d1baafd8b0a0..b14746dabb93a83eff5cdf9caea130b602668bd9
@@@ -71,8 -71,9 +71,10 @@@ pub struct Config 
      pub on_fail: Option<String>,
      pub stage: u32,
      pub keep_stage: Vec<u32>,
 +    pub keep_stage_std: Vec<u32>,
      pub src: PathBuf,
+     // defaults to `config.toml`
+     pub config: PathBuf,
      pub jobs: Option<u32>,
      pub cmd: Subcommand,
      pub incremental: bool,
Simple merge