From ab6e7281f261b9ca71ff1d9bbe14e9d13ce5f2ee Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Fri, 3 Mar 2023 16:09:37 +0800 Subject: [PATCH] Update rustup mode tests --- src/cli/rustup_mode.rs | 25 +++------ .../rustup_check_cmd_help_flag_stdout.toml | 5 +- ...stup_completions_cmd_help_flag_stdout.toml | 11 ++-- ...omponent_cmd_add_cmd_help_flag_stdout.toml | 11 ++-- ...mponent_cmd_list_cmd_help_flag_stdout.toml | 13 +++-- ...onent_cmd_remove_cmd_help_flag_stdout.toml | 11 ++-- .../rustup_default_cmd_help_flag_stdout.toml | 11 ++-- .../rustup_doc_cmd_help_flag_stdout.toml | 53 ++++++++++--------- .../cli-ui/rustup/rustup_help_cmd_stdout.toml | 19 +++---- .../rustup/rustup_help_flag_stdout.toml | 19 +++---- .../rustup_man_cmd_help_flag_stdout.toml | 11 ++-- ...override_cmd_add_cmd_help_flag_stdout.toml | 9 ++-- .../rustup_override_cmd_help_flag_stdout.toml | 7 +-- ...verride_cmd_list_cmd_help_flag_stdout.toml | 5 +- ...rride_cmd_remove_cmd_help_flag_stdout.toml | 9 ++-- ...override_cmd_set_cmd_help_flag_stdout.toml | 9 ++-- ...erride_cmd_unset_cmd_help_flag_stdout.toml | 9 ++-- .../rustup_run_cmd_help_flag_stdout.toml | 15 +++--- .../rustup_self_cmd_help_flag_stdout.toml | 7 +-- ...lf_cmd_uninstall_cmd_help_flag_stdout.toml | 7 +-- ..._self_cmd_update_cmd_help_flag_stdout.toml | 5 +- ...md_upgrade-data _cmd_help_flag_stdout.toml | 5 +- ...auto-self-update_cmd_help_flag_stdout.toml | 10 ++-- ...cmd_default-host_cmd_help_flag_stdout.toml | 8 +-- .../rustup_set_cmd_help_flag_stdout.toml | 9 ++-- ..._set_cmd_profile_cmd_help_flag_stdout.toml | 10 ++-- ...active-toolchain_cmd_help_flag_stdout.toml | 7 +-- .../rustup_show_cmd_help_flag_stdout.toml | 9 ++-- ...up_show_cmd_home_cmd_help_flag_stdout.toml | 5 +- ...up_show_cmd_keys_cmd_help_flag_stdout.toml | 5 +- ...show_cmd_profile_cmd_help_flag_stdout.toml | 5 +- ...p_target_cmd_add_cmd_help_flag_stdout.toml | 11 ++-- .../rustup_target_cmd_help_flag_stdout.toml | 7 +-- ..._target_cmd_list_cmd_help_flag_stdout.toml | 13 +++-- ...arget_cmd_remove_cmd_help_flag_stdout.toml | 11 ++-- ...rustup_toolchain_cmd_help_flag_stdout.toml | 7 +-- ...hain_cmd_install_cmd_help_flag_stdout.toml | 25 ++++----- ...olchain_cmd_link_cmd_help_flag_stdout.toml | 7 +-- ...olchain_cmd_list_cmd_help_flag_stdout.toml | 7 +-- ...in_cmd_uninstall_cmd_help_flag_stdout.toml | 11 ++-- .../rustup_up_cmd_help_flag_stdout.toml | 21 ++++---- .../rustup_update_cmd_help_flag_stdout.toml | 21 ++++---- .../rustup_upgrade_cmd_help_flag_stdout.toml | 21 ++++---- .../rustup_which_cmd_help_flag_stdout.toml | 11 ++-- 44 files changed, 261 insertions(+), 256 deletions(-) diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs index c856f11833..c6f8550d36 100644 --- a/src/cli/rustup_mode.rs +++ b/src/cli/rustup_mode.rs @@ -71,11 +71,11 @@ pub fn main() -> Result { let matches = match cli().try_get_matches_from(process().args_os()) { Ok(matches) => Ok(matches), Err(err) if err.kind() == DisplayHelp => { - writeln!(process().stdout().lock(), "{}", err)?; + writeln!(process().stdout().lock(), "{err}")?; return Ok(utils::ExitCode(0)); } Err(err) if err.kind() == DisplayVersion => { - writeln!(process().stdout().lock(), "{}", err)?; + writeln!(process().stdout().lock(), "{err}")?; info!("This is the version for the rustup toolchain manager, not the rustc compiler."); fn rustc_version() -> std::result::Result> { @@ -107,7 +107,7 @@ pub fn main() -> Result { ] .contains(&err.kind()) { - writeln!(process().stdout().lock(), "{}", err)?; + writeln!(process().stdout().lock(), "{err}")?; return Ok(utils::ExitCode(1)); } Err(err) @@ -207,16 +207,6 @@ pub(crate) fn cli() -> Command<'static> { .arg( verbose_arg("Enable verbose output"), ) - .help_template( - "\ -{name} {version} -{about} - -USAGE: - {usage} - -{all-args}", - ) .arg( Arg::new("quiet") .conflicts_with("verbose") @@ -351,7 +341,6 @@ USAGE: Arg::new("toolchain") .help(TOOLCHAIN_ARG_HELP) .required(false) - .takes_value(true), ), ) .subcommand( @@ -392,7 +381,7 @@ USAGE: .takes_value(true) .multiple_values(true) .use_value_delimiter(true) - .action(ArgAction::Append), + .action(ArgAction::Append), ) .arg( Arg::new("targets") @@ -401,8 +390,8 @@ USAGE: .short('t') .takes_value(true) .multiple_values(true) - .multiple_occurrences(true) - .use_value_delimiter(true), + .use_value_delimiter(true) + .action(ArgAction::Append), ) .arg( Arg::new("no-self-update") @@ -1520,7 +1509,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches) -> Result { info!("override toolchain for '{}' removed", path); } else { info!("no override toolchain for '{}'", path); - if !m.get_one::("path").is_some() && !m.get_flag("nonexistent") { + if m.get_one::("path").is_none() && !m.get_flag("nonexistent") { info!( "you may use `--path ` option to remove override toolchain \ for a specific path" diff --git a/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml index 3e707294c6..0be13627b2 100644 --- a/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ Check for updates to Rust toolchains and rustup USAGE: rustup[EXE] check -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml index 0389eea1fd..c4f31ff299 100644 --- a/tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml @@ -7,12 +7,12 @@ Generate tab-completion scripts for your shell USAGE: rustup[EXE] completions [ARGS] -FLAGS: - -h, --help Prints help information - ARGS: - [possible values: zsh, bash, fish, powershell, elvish] - [possible values: rustup, cargo] + [possible values: bash, elvish, fish, powershell, zsh] + [possible values: rustup, cargo] + +OPTIONS: + -h, --help Print help information DISCUSSION: Enable tab completion for Bash, Fish, Zsh, or PowerShell @@ -134,5 +134,6 @@ ${env:USERPROFILE}/Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1 ZSH: $ rustup completions zsh cargo > ~/.zfunc/_cargo + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml index 8d3af97ad6..cb5f15b2b7 100644 --- a/tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml @@ -7,15 +7,14 @@ Add a component to a Rust toolchain USAGE: rustup[EXE] component add [OPTIONS] ... -FLAGS: - -h, --help Prints help information +ARGS: + ... OPTIONS: + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` --target - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + -h, --help Print help information -ARGS: - ... """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml index b4c64893fe..cb1516719a 100644 --- a/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml @@ -5,14 +5,13 @@ stdout = """ List installed and available components USAGE: - rustup[EXE] component list [FLAGS] [OPTIONS] - -FLAGS: - -h, --help Prints help information - --installed List only installed components + rustup[EXE] component list [OPTIONS] OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + --installed List only installed components + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml index eafe8eb470..3a84f7092c 100644 --- a/tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml @@ -7,15 +7,14 @@ Remove a component from a Rust toolchain USAGE: rustup[EXE] component remove [OPTIONS] ... -FLAGS: - -h, --help Prints help information +ARGS: + ... OPTIONS: + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` --target - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + -h, --help Print help information -ARGS: - ... """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml index 86e86a477a..1bb3bd154c 100644 --- a/tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml @@ -7,15 +7,16 @@ Set the default toolchain USAGE: rustup[EXE] default [toolchain] -FLAGS: - -h, --help Prints help information - ARGS: - Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` + Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information + see `rustup help toolchain` + +OPTIONS: + -h, --help Print help information DISCUSSION: Sets the default toolchain to the one specified. If the toolchain is not already installed then it is installed first. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml index 90e88d4d5e..69e11f2c6a 100644 --- a/tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml @@ -5,35 +5,35 @@ stdout = """ Open the documentation for the current toolchain USAGE: - rustup[EXE] doc [FLAGS] [OPTIONS] [topic] + rustup[EXE] doc [OPTIONS] [topic] -FLAGS: - --alloc The Rust core allocation and collections library - --book The Rust Programming Language book - --cargo The Cargo Book - --core The Rust Core Library - --edition-guide The Rust Edition Guide - --embedded-book The Embedded Rust Book - -h, --help Prints help information - --nomicon The Dark Arts of Advanced and Unsafe Rust Programming - --path Only print the path to the documentation - --proc_macro A support library for macro authors when defining new macros - --reference The Rust Reference - --rust-by-example A collection of runnable examples that illustrate various Rust concepts and standard - libraries - --rustc The compiler for the Rust programming language - --rustdoc Documentation generator for Rust projects - --std Standard library API documentation - --test Support code for rustc's built in unit-test and micro-benchmarking framework - --unstable-book The Unstable Book +ARGS: + Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', + 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', + 'std::io::error::Result' etc... OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` - -ARGS: - Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', - 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc... + --path Only print the path to the documentation + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + --alloc The Rust core allocation and collections library + --book The Rust Programming Language book + --cargo The Cargo Book + --core The Rust Core Library + --edition-guide The Rust Edition Guide + --nomicon The Dark Arts of Advanced and Unsafe Rust Programming + --proc_macro A support library for macro authors when defining new macros + --reference The Rust Reference + --rust-by-example A collection of runnable examples that illustrate various Rust + concepts and standard libraries + --rustc The compiler for the Rust programming language + --rustdoc Documentation generator for Rust projects + --std Standard library API documentation + --test Support code for rustc's built in unit-test and + micro-benchmarking framework + --unstable-book The Unstable Book + --embedded-book The Embedded Rust Book + -h, --help Print help information DISCUSSION: Opens the documentation for the currently active toolchain with @@ -41,5 +41,6 @@ DISCUSSION: By default, it opens the documentation index. Use the various flags to open specific pieces of documentation. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml b/tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml index 2d37691dd6..617e3d3e23 100644 --- a/tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml @@ -6,17 +6,17 @@ rustup [..] The Rust toolchain installer USAGE: - rustup[EXE] [FLAGS] [+toolchain] - -FLAGS: - -v, --verbose Enable verbose output - -q, --quiet Disable progress output - -h, --help Prints help information - -V, --version Prints version information + rustup[EXE] [OPTIONS] [+toolchain] [SUBCOMMAND] ARGS: <+toolchain> release channel (e.g. +stable) or custom toolchain to set override +OPTIONS: + -v, --verbose Enable verbose output + -q, --quiet Disable progress output + -h, --help Print help information + -V, --version Print version information + SUBCOMMANDS: show Show the active and installed toolchains or profiles update Update Rust toolchains and rustup @@ -29,11 +29,11 @@ SUBCOMMANDS: run Run a command with an environment configured for a given toolchain which Display which binary will be run for a given command doc Open the documentation for the current toolchain -... + man View the man page for a given command self Modify the rustup installation set Alter rustup settings completions Generate tab-completion scripts for your shell - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) DISCUSSION: Rustup installs The Rust Programming Language from the official @@ -44,5 +44,6 @@ DISCUSSION: If you are new to Rust consider running `rustup doc --book` to learn Rust. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml index 3a53e3ea37..daa6d2ad3e 100644 --- a/tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml @@ -6,17 +6,17 @@ rustup [..] The Rust toolchain installer USAGE: - rustup[EXE] [FLAGS] [+toolchain] - -FLAGS: - -v, --verbose Enable verbose output - -q, --quiet Disable progress output - -h, --help Prints help information - -V, --version Prints version information + rustup[EXE] [OPTIONS] [+toolchain] [SUBCOMMAND] ARGS: <+toolchain> release channel (e.g. +stable) or custom toolchain to set override +OPTIONS: + -v, --verbose Enable verbose output + -q, --quiet Disable progress output + -h, --help Print help information + -V, --version Print version information + SUBCOMMANDS: show Show the active and installed toolchains or profiles update Update Rust toolchains and rustup @@ -29,11 +29,11 @@ SUBCOMMANDS: run Run a command with an environment configured for a given toolchain which Display which binary will be run for a given command doc Open the documentation for the current toolchain -... + man View the man page for a given command self Modify the rustup installation set Alter rustup settings completions Generate tab-completion scripts for your shell - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) DISCUSSION: Rustup installs The Rust Programming Language from the official @@ -44,5 +44,6 @@ DISCUSSION: If you are new to Rust consider running `rustup doc --book` to learn Rust. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml index 8b40dcc950..962851a0b5 100644 --- a/tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml @@ -7,14 +7,13 @@ View the man page for a given command USAGE: rustup[EXE] man [OPTIONS] -FLAGS: - -h, --help Prints help information +ARGS: + OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + -h, --help Print help information -ARGS: - """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml index 9b60d6d6ce..b5bd0f793f 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml @@ -7,14 +7,13 @@ Set the override toolchain for a directory USAGE: rustup[EXE] override set [OPTIONS] -FLAGS: - -h, --help Prints help information +ARGS: + Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information + see `rustup help toolchain` OPTIONS: --path Path to the directory + -h, --help Print help information -ARGS: - Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml index 29611950c2..e99dedf9a9 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml @@ -7,14 +7,14 @@ Modify directory toolchain overrides USAGE: rustup[EXE] override -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information SUBCOMMANDS: list List directory toolchain overrides set Set the override toolchain for a directory unset Remove the override toolchain for a directory - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) DISCUSSION: Overrides configure Rustup to use a specific toolchain when @@ -36,5 +36,6 @@ DISCUSSION: To see the active toolchain use `rustup show`. To remove the override and use the default toolchain again, `rustup override unset`. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml index e1c8952087..7aeba37d02 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ List directory toolchain overrides USAGE: rustup[EXE] override list -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml index 0663165a39..254a9e9b7d 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml @@ -5,14 +5,12 @@ stdout = """ Remove the override toolchain for a directory USAGE: - rustup[EXE] override unset [FLAGS] [OPTIONS] - -FLAGS: - -h, --help Prints help information - --nonexistent Remove override toolchain for all nonexistent directories + rustup[EXE] override unset [OPTIONS] OPTIONS: --path Path to the directory + --nonexistent Remove override toolchain for all nonexistent directories + -h, --help Print help information DISCUSSION: If `--path` argument is present, removes the override toolchain @@ -20,5 +18,6 @@ DISCUSSION: present, removes the override toolchain for all nonexistent directories. Otherwise, removes the override toolchain for the current directory. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml index 2447565140..3d669d3801 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml @@ -7,14 +7,13 @@ Set the override toolchain for a directory USAGE: rustup[EXE] override set [OPTIONS] -FLAGS: - -h, --help Prints help information +ARGS: + Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information + see `rustup help toolchain` OPTIONS: --path Path to the directory + -h, --help Print help information -ARGS: - Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml index 0663165a39..254a9e9b7d 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml @@ -5,14 +5,12 @@ stdout = """ Remove the override toolchain for a directory USAGE: - rustup[EXE] override unset [FLAGS] [OPTIONS] - -FLAGS: - -h, --help Prints help information - --nonexistent Remove override toolchain for all nonexistent directories + rustup[EXE] override unset [OPTIONS] OPTIONS: --path Path to the directory + --nonexistent Remove override toolchain for all nonexistent directories + -h, --help Print help information DISCUSSION: If `--path` argument is present, removes the override toolchain @@ -20,5 +18,6 @@ DISCUSSION: present, removes the override toolchain for all nonexistent directories. Otherwise, removes the override toolchain for the current directory. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml index 0a0c902787..20e1ee1a6b 100644 --- a/tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml @@ -5,17 +5,17 @@ stdout = """ Run a command with an environment configured for a given toolchain USAGE: - rustup[EXE] run [FLAGS] ... - -FLAGS: - -h, --help Prints help information - --install Install the requested toolchain if needed + rustup[EXE] run [OPTIONS] ... ARGS: - Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` + Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` ... +OPTIONS: + --install Install the requested toolchain if needed + -h, --help Print help information + DISCUSSION: Configures an environment to use the given toolchain and then runs the specified program. The command may be any program, not just @@ -30,5 +30,6 @@ DISCUSSION: $ cargo +nightly build $ rustup run nightly cargo build + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml index a60e056fa8..cf87e125d0 100644 --- a/tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml @@ -7,13 +7,14 @@ Modify the rustup installation USAGE: rustup[EXE] self -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information SUBCOMMANDS: update Download and install updates to rustup uninstall Uninstall rustup. upgrade-data Upgrade the internal data format. - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml index 3f230e6496..add410f53a 100644 --- a/tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml @@ -5,10 +5,11 @@ stdout = """ Uninstall rustup. USAGE: - rustup[EXE] self uninstall [FLAGS] + rustup[EXE] self uninstall [OPTIONS] -FLAGS: - -h, --help Prints help information +OPTIONS: -y + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml index 72cb5f837d..e81a54107b 100644 --- a/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ Download and install updates to rustup USAGE: rustup[EXE] self update -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml index 9cf019ea92..a9b9c02234 100644 --- a/tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ Upgrade the internal data format. USAGE: rustup[EXE] self upgrade-data -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml index 622ab90522..65508bbbc3 100644 --- a/tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml @@ -7,11 +7,11 @@ The rustup auto self update mode USAGE: rustup[EXE] set auto-self-update -FLAGS: - -h, --help Prints help information - -V, --version Prints version information - ARGS: - [default: enable] [possible values: enable, disable, check-only] + [default: enable] [possible values: enable, disable, check-only] + +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml index 4df7a55911..428953988f 100644 --- a/tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml @@ -7,11 +7,11 @@ The triple used to identify toolchains when not specified USAGE: rustup[EXE] set default-host -FLAGS: - -h, --help Prints help information - -V, --version Prints version information - ARGS: + +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml index 2c92922e19..20641c5c65 100644 --- a/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml @@ -7,13 +7,14 @@ Alter rustup settings USAGE: rustup[EXE] set -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information SUBCOMMANDS: - auto-self-update The rustup auto self update mode default-host The triple used to identify toolchains when not specified - help Prints this message or the help of the given subcommand(s) profile The default components installed + auto-self-update The rustup auto self update mode + help Print this message or the help of the given subcommand(s) + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml index 1a6db002d1..de26eb61fd 100644 --- a/tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml @@ -7,11 +7,11 @@ The default components installed USAGE: rustup[EXE] set profile -FLAGS: - -h, --help Prints help information - -V, --version Prints version information - ARGS: - [default: default] [possible values: minimal, default, complete] + [default: default] [possible values: minimal, default, complete] + +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml index 93aca775d2..1c8eca7e30 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml @@ -5,11 +5,11 @@ stdout = """ Show the active toolchain USAGE: - rustup[EXE] show active-toolchain [FLAGS] + rustup[EXE] show active-toolchain [OPTIONS] -FLAGS: - -h, --help Prints help information +OPTIONS: -v, --verbose Enable verbose output with rustc information + -h, --help Print help information DISCUSSION: Shows the name of the active toolchain. @@ -19,5 +19,6 @@ DISCUSSION: You should use `rustc --print sysroot` to get the sysroot, or `rustc --version` to get the toolchain version. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml index bb5425ca45..f99000e07c 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml @@ -5,18 +5,18 @@ stdout = """ Show the active and installed toolchains or profiles USAGE: - rustup[EXE] show [FLAGS] [SUBCOMMAND] + rustup[EXE] show [OPTIONS] [SUBCOMMAND] -FLAGS: +OPTIONS: -v, --verbose Enable verbose output with rustc information for all installed toolchains - -h, --help Prints help information + -h, --help Print help information SUBCOMMANDS: active-toolchain Show the active toolchain home Display the computed value of RUSTUP_HOME profile Show the current profile keys Display the known PGP keys - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) DISCUSSION: Shows the name of the active toolchain and the version of `rustc`. @@ -26,5 +26,6 @@ DISCUSSION: If there are multiple toolchains installed then all installed toolchains are listed as well. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml index 130dd5b45a..d00738631e 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ Display the computed value of RUSTUP_HOME USAGE: rustup[EXE] show home -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml index 752b2bacee..fd0d2dee99 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ Display the known PGP keys USAGE: rustup[EXE] show keys -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml index 1e6995f092..49dbe0213b 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml @@ -7,7 +7,8 @@ Show the current profile USAGE: rustup[EXE] show profile -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml index 5eb8a3b096..fea2874f81 100644 --- a/tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml @@ -7,14 +7,13 @@ Add a target to a Rust toolchain USAGE: rustup[EXE] target add [OPTIONS] ... -FLAGS: - -h, --help Prints help information +ARGS: + ... List of targets to install; \"all\" installs all available targets OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + -h, --help Print help information -ARGS: - ... List of targets to install; \"all\" installs all available targets """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml index a11997fdf9..4948b5e0da 100644 --- a/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml @@ -7,13 +7,14 @@ Modify a toolchain's supported targets USAGE: rustup[EXE] target -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information SUBCOMMANDS: list List installed and available targets add Add a target to a Rust toolchain remove Remove a target from a Rust toolchain - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml index ae6df3b036..e8a424e714 100644 --- a/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml @@ -5,14 +5,13 @@ stdout = """ List installed and available targets USAGE: - rustup[EXE] target list [FLAGS] [OPTIONS] - -FLAGS: - -h, --help Prints help information - --installed List only installed targets + rustup[EXE] target list [OPTIONS] OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + --installed List only installed targets + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml index c66298321f..6fecca9ccf 100644 --- a/tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml @@ -7,14 +7,13 @@ Remove a target from a Rust toolchain USAGE: rustup[EXE] target remove [OPTIONS] ... -FLAGS: - -h, --help Prints help information +ARGS: + ... List of targets to uninstall OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + -h, --help Print help information -ARGS: - ... """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml index eed7045818..6b81d52fba 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml @@ -7,15 +7,15 @@ Modify or query the installed toolchains USAGE: rustup[EXE] toolchain -FLAGS: - -h, --help Prints help information +OPTIONS: + -h, --help Print help information SUBCOMMANDS: list List installed toolchains install Install or update a given toolchain uninstall Uninstall a toolchain link Create a custom toolchain by symlinking to a directory - help Prints this message or the help of the given subcommand(s) + help Print this message or the help of the given subcommand(s) DISCUSSION: Many `rustup` commands deal with *toolchains*, a single @@ -58,5 +58,6 @@ DISCUSSION: rustup can also manage symlinked local toolchain builds, which are often used for developing Rust itself. For more information see `rustup toolchain help link`. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml index 2e4253449f..ae33af4b39 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml @@ -5,23 +5,24 @@ stdout = """ Install or update a given toolchain USAGE: - rustup[EXE] toolchain install [FLAGS] [OPTIONS] ... + rustup[EXE] toolchain install [OPTIONS] ... -FLAGS: - --allow-downgrade Allow rustup to downgrade the toolchain to satisfy your component choice - --force Force an update, even if some components are missing - --force-non-host Install toolchains that require an emulator. See https://github.com/rust- - lang/rustup/wiki/Non-host-toolchains - -h, --help Prints help information - --no-self-update Don't perform self update when running the`rustup toolchain install` command +ARGS: + ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` OPTIONS: + --profile [possible values: minimal, default, complete] -c, --component ... Add specific components on installation - --profile [possible values: minimal, default, complete] -t, --target ... Add specific targets on installation + --no-self-update Don't perform self update when running the`rustup toolchain + install` command + --force Force an update, even if some components are missing + --allow-downgrade Allow rustup to downgrade the toolchain to satisfy your + component choice + --force-non-host Install toolchains that require an emulator. See + https://github.com/rust-lang/rustup/wiki/Non-host-toolchains + -h, --help Print help information -ARGS: - ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml index 82e809fe4c..31d023c567 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml @@ -7,13 +7,13 @@ Create a custom toolchain by symlinking to a directory USAGE: rustup[EXE] toolchain link -FLAGS: - -h, --help Prints help information - ARGS: Custom toolchain name Path to the directory +OPTIONS: + -h, --help Print help information + DISCUSSION: 'toolchain' is the custom name to be assigned to the new toolchain. Any name is permitted as long as it does not fully match an initial @@ -32,5 +32,6 @@ DISCUSSION: If you now compile a crate in the current directory, the custom toolchain 'latest-stage1' will be used. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml index b40f471f0f..84db5f94e3 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml @@ -5,10 +5,11 @@ stdout = """ List installed toolchains USAGE: - rustup[EXE] toolchain list [FLAGS] + rustup[EXE] toolchain list [OPTIONS] -FLAGS: - -h, --help Prints help information +OPTIONS: -v, --verbose Enable verbose output with toolchain information + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml index b6c58490e2..c88f683251 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml @@ -7,11 +7,12 @@ Uninstall a toolchain USAGE: rustup[EXE] toolchain uninstall ... -FLAGS: - -h, --help Prints help information - ARGS: - ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` + ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + +OPTIONS: + -h, --help Print help information + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml index eed4674058..8122173b68 100644 --- a/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml @@ -5,18 +5,18 @@ stdout = """ Update Rust toolchains and rustup USAGE: - rustup[EXE] update [FLAGS] [toolchain]... - -FLAGS: - --force Force an update, even if some components are missing - --force-non-host Install toolchains that require an emulator. See https://github.com/rust- - lang/rustup/wiki/Non-host-toolchains - -h, --help Prints help information - --no-self-update Don't perform self update when running the `rustup update` command + rustup[EXE] update [OPTIONS] [toolchain]... ARGS: - ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` + ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + +OPTIONS: + --no-self-update Don't perform self update when running the `rustup update` command + --force Force an update, even if some components are missing + --force-non-host Install toolchains that require an emulator. See + https://github.com/rust-lang/rustup/wiki/Non-host-toolchains + -h, --help Print help information DISCUSSION: With no toolchain specified, the `update` command updates each of @@ -25,5 +25,6 @@ DISCUSSION: If given a toolchain argument then `update` updates that toolchain, the same as `rustup toolchain install`. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml index 9d6c272728..166a9f5dba 100644 --- a/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml @@ -5,18 +5,18 @@ stdout = """ Update Rust toolchains and rustup USAGE: - rustup[EXE] update [FLAGS] [toolchain]... - -FLAGS: - --force Force an update, even if some components are missing - --force-non-host Install toolchains that require an emulator. See https://github.com/rust- - lang/rustup/wiki/Non-host-toolchains - -h, --help Prints help information - --no-self-update Don't perform self update when running the `rustup update` command + rustup[EXE] update [OPTIONS] [toolchain]... ARGS: - ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` + ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + +OPTIONS: + --no-self-update Don't perform self update when running the `rustup update` command + --force Force an update, even if some components are missing + --force-non-host Install toolchains that require an emulator. See + https://github.com/rust-lang/rustup/wiki/Non-host-toolchains + -h, --help Print help information DISCUSSION: With no toolchain specified, the `update` command updates each of @@ -25,5 +25,6 @@ DISCUSSION: If given a toolchain argument then `update` updates that toolchain, the same as `rustup toolchain install`. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml index 369cde2f13..78e398e1a0 100644 --- a/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml @@ -5,18 +5,18 @@ stdout = """ Update Rust toolchains and rustup USAGE: - rustup[EXE] update [FLAGS] [toolchain]... - -FLAGS: - --force Force an update, even if some components are missing - --force-non-host Install toolchains that require an emulator. See https://github.com/rust- - lang/rustup/wiki/Non-host-toolchains - -h, --help Prints help information - --no-self-update Don't perform self update when running the `rustup update` command + rustup[EXE] update [OPTIONS] [toolchain]... ARGS: - ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help - toolchain` + ... Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + +OPTIONS: + --no-self-update Don't perform self update when running the `rustup update` command + --force Force an update, even if some components are missing + --force-non-host Install toolchains that require an emulator. See + https://github.com/rust-lang/rustup/wiki/Non-host-toolchains + -h, --help Print help information DISCUSSION: With no toolchain specified, the `update` command updates each of @@ -25,5 +25,6 @@ DISCUSSION: If given a toolchain argument then `update` updates that toolchain, the same as `rustup toolchain install`. + """ stderr = "" diff --git a/tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml index 06d6fa75a8..d22e3336a0 100644 --- a/tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml @@ -7,14 +7,13 @@ Display which binary will be run for a given command USAGE: rustup[EXE] which [OPTIONS] -FLAGS: - -h, --help Prints help information +ARGS: + OPTIONS: - --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see - `rustup help toolchain` + --toolchain Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more + information see `rustup help toolchain` + -h, --help Print help information -ARGS: - """ stderr = ""