Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve preinstalled rust message #2155

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/cli/self_update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,10 @@ 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 cannot be installed alongside Rust. Please uninstall first");
err!("if this is what you want, restart the installation with `-y'");
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.");
Err("cannot install while Rust is installed".into())
} else {
Ok(())
Expand Down
4 changes: 2 additions & 2 deletions tests/cli-misc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ fn install_stops_if_rustc_exists() {
.contains("it looks like you have an existing installation of Rust at:"));
assert!(out
.stderr
.contains("if this is what you want, restart the installation with `-y'"));
.contains("restart the installation and pass `-y'"));
});
}

Expand Down Expand Up @@ -654,7 +654,7 @@ fn install_stops_if_cargo_exists() {
.contains("it looks like you have an existing installation of Rust at:"));
assert!(out
.stderr
.contains("if this is what you want, restart the installation with `-y'"));
.contains("restart the installation and pass `-y'"));
});
}

Expand Down