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 = ""