Merge pull request #1640 from dwijnand/use-empty-println

Use println!() over println!("")

Author: nrc

src/rustup-cli/common.rs

@@ -27,7 +27,7 @@ pub fn confirm(question: &str, default: bool) -> Result<bool> {
         _ => false,
     };
 
-    println!("");
+    println!();
 
     Ok(r)
 }
@@ -39,7 +39,7 @@ pub enum Confirm {
 }
 
 pub fn confirm_advanced() -> Result<Confirm> {
-    println!("");
+    println!();
     println!("1) Proceed with installation (default)");
     println!("2) Customize installation");
     println!("3) Cancel installation");
@@ -54,7 +54,7 @@ pub fn confirm_advanced() -> Result<Confirm> {
         _ => Confirm::No,
     };
 
-    println!("");
+    println!();
 
     Ok(r)
 }
@@ -64,7 +64,7 @@ pub fn question_str(question: &str, default: &str) -> Result<String> {
     let _ = std::io::stdout().flush();
     let input = read_line()?;
 
-    println!("");
+    println!();
 
     if input.is_empty() {
         Ok(default.to_string())
@@ -79,7 +79,7 @@ pub fn question_bool(question: &str, default: bool) -> Result<bool> {
     let _ = std::io::stdout().flush();
     let input = read_line()?;
 
-    println!("");
+    println!();
 
     if input.is_empty() {
         Ok(default)
@@ -208,7 +208,7 @@ pub fn update_all_channels(cfg: &Cfg, do_self_update: bool, force_update: bool)
 
     let show_channel_updates = || {
         if !toolchains.is_empty() {
-            println!("");
+            println!();
 
             show_channel_updates(cfg, toolchains)?;
         }
@@ -383,7 +383,7 @@ pub fn list_overrides(cfg: &Cfg) -> Result<()> {
             )
         }
         if any_not_exist {
-            println!("");
+            println!();
             info!(
                 "you may remove overrides for non-existent directories with
 `rustup override unset --nonexistent`"
@@ -410,7 +410,7 @@ pub fn report_error(e: &Error) {
     if show_backtrace() {
         if let Some(backtrace) = e.backtrace() {
             info!("backtrace:");
-            println!("");
+            println!();
             println!("{:?}", backtrace);
         }
     } else {

src/rustup-cli/rustup_mode.rs

@@ -537,7 +537,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
                 for n in &candidates {
                     println!("{}", n);
                 }
-                println!("");
+                println!();
             }
         }
         return Err(ErrorKind::ToolchainNotInstalled(name.to_string()).into());
@@ -587,7 +587,7 @@ fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     toolchain.make_default()?;
 
     if let Some(status) = status {
-        println!("");
+        println!();
         common::show_channel_update(cfg, toolchain.name(), Ok(status))?;
     }
 
@@ -610,7 +610,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
             };
 
             if let Some(status) = status {
-                println!("");
+                println!();
                 common::show_channel_update(cfg, toolchain.name(), Ok(status))?;
             }
         }
@@ -657,7 +657,7 @@ fn show(cfg: &Cfg) -> Result<()> {
         let _ = write!(t, "Default host: ");
         let _ = t.reset();
         println!("{}", cfg.get_default_host_triple()?);
-        println!("");
+        println!();
     }
 
     let ref cwd = utils::current_dir()?;
@@ -710,7 +710,7 @@ fn show(cfg: &Cfg) -> Result<()> {
             }
         }
         if show_headers {
-            println!("")
+            println!()
         };
     }
 
@@ -728,7 +728,7 @@ fn show(cfg: &Cfg) -> Result<()> {
             );
         }
         if show_headers {
-            println!("")
+            println!()
         };
     }
 
@@ -761,7 +761,7 @@ fn show(cfg: &Cfg) -> Result<()> {
         }
 
         if show_headers {
-            println!("")
+            println!()
         };
     }
 
@@ -911,7 +911,7 @@ fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     toolchain.make_override(&utils::current_dir()?)?;
 
     if let Some(status) = status {
-        println!("");
+        println!();
         common::show_channel_update(cfg, toolchain.name(), Ok(status))?;
     }
 

src/rustup-cli/self_update.rs

@@ -290,7 +290,7 @@ pub fn install(no_prompt: bool, verbose: bool, mut opts: InstallOpts) -> Result<
         // the user an opportunity to see the error before the
         // window closes.
         if cfg!(windows) && !no_prompt {
-            println!("");
+            println!();
             println!("Press the Enter key to continue.");
             common::read_line()?;
         }
@@ -325,7 +325,7 @@ pub fn install(no_prompt: bool, verbose: bool, mut opts: InstallOpts) -> Result<
         // that may have opened just for this purpose, require
         // the user to press a key to continue.
         if cfg!(windows) {
-            println!("");
+            println!();
             println!("Press the Enter key to continue.");
             common::read_line()?;
         }
@@ -650,7 +650,7 @@ fn customize_install(mut opts: InstallOpts) -> Result<InstallOpts> {
          You may simply press the Enter key to leave unchanged."
     );
 
-    println!("");
+    println!();
 
     opts.default_host_triple =
         common::question_str("Default host triple?", &opts.default_host_triple)?;
@@ -800,18 +800,18 @@ fn maybe_install_rust(toolchain_str: &str, default_host_triple: &str, verbose: b
     // possible to select a toolchain then have it not be installed.
     if toolchain_str == "none" {
         info!("skipping toolchain installation");
-        println!("");
+        println!();
     } else if cfg.find_default()?.is_none() {
         // Set host triple first as it will affect resolution of toolchain_str
         cfg.set_default_host_triple(default_host_triple)?;
         let toolchain = cfg.get_toolchain(toolchain_str, false)?;
         let status = toolchain.install_from_dist(false)?;
         cfg.set_default(toolchain_str)?;
-        println!("");
+        println!();
         common::show_channel_update(cfg, toolchain_str, Ok(status))?;
     } else {
         info!("updating existing rustup installation");
-        println!("");
+        println!();
     }
 
     Ok(())
@@ -846,7 +846,7 @@ pub fn uninstall(no_prompt: bool) -> Result<()> {
     }
 
     if !no_prompt {
-        println!("");
+        println!();
         let ref msg = format!(pre_uninstall_msg!(), cargo_home = canonical_cargo_home()?);
         term2::stdout().md(msg);
         if !common::confirm("\nContinue? (y/N)", false)? {