Improved warning/error message for check_existence_of_rustc_or_cargo_in_path.

Author: sollyucko

src/cli/self_update.rs

@@ -391,12 +391,13 @@ fn check_existence_of_rustc_or_cargo_in_path(no_prompt: bool) -> Result<()> {
     }
 
     if let Err(path) = rustc_or_cargo_exists_in_path() {
-        err!("it looks like you have an existing installation of Rust at:");
-        err!("{}", path);
-        err!("rustup should not be installed alongside Rust. Please uninstall your existing Rust first.");
-        err!("Otherwise you may have confusion unless you are careful with your PATH");
-        err!("If you are sure that you want both rustup and your already installed Rust");
-        err!("then please restart the installation and pass `-y' to bypass this check.");
+        warn!("it looks like you have an existing installation of Rust at:");
+        warn!("{}", path);
+        warn!("rustup should not be installed alongside Rust. Please uninstall your existing Rust first.");
+        warn!("Otherwise you may have confusion unless you are careful with your PATH");
+        warn!("If you are sure that you want both rustup and your already installed Rust");
+        warn!("then please reply `y' or `yes' or set RUSTUP_INIT_SKIP_PATH_CHECK to yes");
+        warn!("or pass `-y' to ignore all ignorable checks.");
         ignorable_error("cannot install while Rust is installed".into(), no_prompt)?;
     }
     Ok(())

tests/cli-misc.rs

@@ -620,7 +620,7 @@ fn install_stops_if_rustc_exists() {
             .contains("it looks like you have an existing installation of Rust at:"));
         assert!(out
             .stderr
-            .contains("restart the installation and pass `-y'"));
+            .contains("If you are sure that you want both rustup and your already installed Rust"));
     });
 }
 
@@ -652,7 +652,7 @@ fn install_stops_if_cargo_exists() {
             .contains("it looks like you have an existing installation of Rust at:"));
         assert!(out
             .stderr
-            .contains("restart the installation and pass `-y'"));
+            .contains("If you are sure that you want both rustup and your already installed Rust"));
     });
 }