Remove extra new line after help

Author: 0xPoe

rustup-init.sh

@@ -67,7 +67,6 @@ OPTIONS:
 
     -V, --version
             Print version information
-
 EOF
 }
 

src/cli/rustup_mode.rs

@@ -71,11 +71,11 @@ pub fn main() -> Result<utils::ExitCode> {
     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}")?;
+            write!(process().stdout().lock(), "{err}")?;
             return Ok(utils::ExitCode(0));
         }
         Err(err) if err.kind() == DisplayVersion => {
-            writeln!(process().stdout().lock(), "{err}")?;
+            write!(process().stdout().lock(), "{err}")?;
             info!("This is the version for the rustup toolchain manager, not the rustc compiler.");
 
             fn rustc_version() -> std::result::Result<String, Box<dyn std::error::Error>> {
@@ -107,7 +107,7 @@ pub fn main() -> Result<utils::ExitCode> {
             ]
             .contains(&err.kind())
             {
-                writeln!(process().stdout().lock(), "{err}")?;
+                write!(process().stdout().lock(), "{err}")?;
                 return Ok(utils::ExitCode(1));
             }
             Err(err)

src/cli/setup_mode.rs

@@ -105,7 +105,7 @@ pub fn main() -> Result<utils::ExitCode> {
             if e.kind() == clap::ErrorKind::DisplayHelp
                 || e.kind() == clap::ErrorKind::DisplayVersion =>
         {
-            writeln!(process().stdout().lock(), "{e}")?;
+            write!(process().stdout().lock(), "{e}")?;
             return Ok(utils::ExitCode(0));
         }
         Err(e) => return Err(e.into()),

tests/suite/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml

@@ -44,6 +44,5 @@ OPTIONS:
 
     -V, --version
             Print version information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml

@@ -44,6 +44,5 @@ OPTIONS:
 
     -V, --version
             Print version information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml

@@ -134,6 +134,5 @@ ${env:USERPROFILE}/Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1
     ZSH:
 
         $ rustup completions zsh cargo > ~/.zfunc/_cargo
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml

@@ -15,6 +15,5 @@ OPTIONS:
                                    information see `rustup help toolchain`
         --target <target>          
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml

@@ -12,6 +12,5 @@ OPTIONS:
                                    information see `rustup help toolchain`
         --installed                List only installed components
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml

@@ -15,6 +15,5 @@ OPTIONS:
                                    information see `rustup help toolchain`
         --target <target>          
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml

@@ -17,6 +17,5 @@ OPTIONS:
 DISCUSSION:
     Sets the default toolchain to the one specified. If the toolchain
     is not already installed then it is installed first.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml

@@ -41,6 +41,5 @@ DISCUSSION:
 
     By default, it opens the documentation index. Use the various
     flags to open specific pieces of documentation.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml

@@ -44,6 +44,5 @@ DISCUSSION:
 
     If you are new to Rust consider running `rustup doc --book` to
     learn Rust.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml

@@ -44,6 +44,5 @@ DISCUSSION:
 
     If you are new to Rust consider running `rustup doc --book` to
     learn Rust.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml

@@ -14,6 +14,5 @@ OPTIONS:
         --toolchain <toolchain>    Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                    information see `rustup help toolchain`
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml

@@ -14,6 +14,5 @@ ARGS:
 OPTIONS:
         --path <path>    Path to the directory
     -h, --help           Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml

@@ -36,6 +36,5 @@ DISCUSSION:
     To see the active toolchain use `rustup show`. To remove the
     override and use the default toolchain again, `rustup override
     unset`.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml

@@ -18,6 +18,5 @@ DISCUSSION:
     present, removes the override toolchain for all nonexistent
     directories. Otherwise, removes the override toolchain for the
     current directory.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml

@@ -14,6 +14,5 @@ ARGS:
 OPTIONS:
         --path <path>    Path to the directory
     -h, --help           Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml

@@ -18,6 +18,5 @@ DISCUSSION:
     present, removes the override toolchain for all nonexistent
     directories. Otherwise, removes the override toolchain for the
     current directory.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml

@@ -30,6 +30,5 @@ DISCUSSION:
         $ cargo +nightly build
 
         $ rustup run nightly cargo build
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml

@@ -15,6 +15,5 @@ SUBCOMMANDS:
     uninstall       Uninstall rustup.
     upgrade-data    Upgrade the internal data format.
     help            Print this message or the help of the given subcommand(s)
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml

@@ -10,6 +10,5 @@ USAGE:
 OPTIONS:
     -y            
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml

@@ -12,6 +12,5 @@ ARGS:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml

@@ -12,6 +12,5 @@ ARGS:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml

@@ -15,6 +15,5 @@ SUBCOMMANDS:
     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 = ""

tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml

@@ -12,6 +12,5 @@ ARGS:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml

@@ -19,6 +19,5 @@ DISCUSSION:
 
     You should use `rustc --print sysroot` to get the sysroot, or
     `rustc --version` to get the toolchain version.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml

@@ -26,6 +26,5 @@ DISCUSSION:
 
     If there are multiple toolchains installed then all installed
     toolchains are listed as well.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml

@@ -9,6 +9,5 @@ USAGE:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml

@@ -14,6 +14,5 @@ OPTIONS:
         --toolchain <toolchain>    Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                    information see `rustup help toolchain`
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml

@@ -15,6 +15,5 @@ SUBCOMMANDS:
     add       Add a target to a Rust toolchain
     remove    Remove a target from a Rust toolchain
     help      Print this message or the help of the given subcommand(s)
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml

@@ -12,6 +12,5 @@ OPTIONS:
                                    information see `rustup help toolchain`
         --installed                List only installed targets
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml

@@ -14,6 +14,5 @@ OPTIONS:
         --toolchain <toolchain>    Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                    information see `rustup help toolchain`
     -h, --help                     Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml

@@ -58,6 +58,5 @@ 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 = ""

tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml

@@ -23,6 +23,5 @@ OPTIONS:
         --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
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml

@@ -32,6 +32,5 @@ DISCUSSION:
 
     If you now compile a crate in the current directory, the custom
     toolchain 'latest-stage1' will be used.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml

@@ -10,6 +10,5 @@ USAGE:
 OPTIONS:
     -v, --verbose    Enable verbose output with toolchain information
     -h, --help       Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml

@@ -13,6 +13,5 @@ ARGS:
 
 OPTIONS:
     -h, --help    Print help information
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml

@@ -25,6 +25,5 @@ DISCUSSION:
 
     If given a toolchain argument then `update` updates that
     toolchain, the same as `rustup toolchain install`.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml

@@ -25,6 +25,5 @@ DISCUSSION:
 
     If given a toolchain argument then `update` updates that
     toolchain, the same as `rustup toolchain install`.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml

@@ -25,6 +25,5 @@ DISCUSSION:
 
     If given a toolchain argument then `update` updates that
     toolchain, the same as `rustup toolchain install`.
-
 """
 stderr = ""

tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml

@@ -14,6 +14,5 @@ OPTIONS:
         --toolchain <toolchain>    Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                    information see `rustup help toolchain`
     -h, --help                     Print help information
-
 """
 stderr = ""