diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-18 18:57:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-18 18:57:02 +0100 |
| commit | 3fb5d8e5ddbd2ec9c3b4bdac8d4c0c8f83bf5ae1 (patch) | |
| tree | 26b3a2d29ce2fc20cfaf92e77a6a2c7272ec6ced /src/bootstrap/flags.rs | |
| parent | 35a99eef32a2b7b9d8e77dde539f869e522d181f (diff) | |
| parent | fca829075fd76385ac6aa7bff957e7eebbf89ae1 (diff) | |
Rollup merge of #96584 - bentongxyz:x-setup-h-v-should-work, r=jyn514
Fix `x setup -h -v` should work r? `@jyn514` I have to convert profile to path and back in order to remove special-casing in bootstrap. I also check for `dry_run` so that `config.toml` and/ or `.git/hooks/pre-push` will not be created if `--dry-run` is specified. Please help me see if this is ok, thanks alot!
Diffstat (limited to 'src/bootstrap/flags.rs')
| -rw-r--r-- | src/bootstrap/flags.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs index 37a8eb884ef..851cb5ecf4c 100644 --- a/src/bootstrap/flags.rs +++ b/src/bootstrap/flags.rs @@ -143,7 +143,7 @@ pub enum Subcommand { args: Vec<String>, }, Setup { - profile: Option<Profile>, + profile: Option<PathBuf>, }, } @@ -351,7 +351,7 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`", // fn usage() let usage = |exit_code: i32, opts: &Options, verbose: bool, subcommand_help: &str| -> ! { - let config = Config::parse(&["build".to_string()]); + let config = Config::parse(&["setup".to_string()]); let build = Build::new(config); let paths = Builder::get_help(&build, subcommand); @@ -621,7 +621,7 @@ Arguments: } Kind::Setup => { let profile = if paths.len() > 1 { - println!("\nat most one profile can be passed to setup\n"); + eprintln!("\nerror: At most one profile can be passed to setup\n"); usage(1, &opts, verbose, &subcommand_help) } else if let Some(path) = paths.pop() { let profile_string = t!(path.into_os_string().into_string().map_err( |
