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

Fix 'show' so it displays helpful information if the active toolchain is not installed. #1189

Merged

Conversation

michaelfletchercgy
Copy link
Contributor

Fixed 'show' so that it displays helpful information if the active toolchain is not installed.

$ export RUSTUP_TOOLCHAIN=beta
$ rustup show
Default host: x86_64-unknown-linux-gnu
installed toolchains
--------------------

stable-x86_64-unknown-linux-gnu
nightly-x86_64-unknown-linux-gnu

active toolchain
----------------

(error: override toolchain 'beta' is not installed, the RUSTUP_TOOLCHAIN environment variable specifies an uninstalled toolchain)

Fixes #1178

@bors
Copy link
Contributor

bors commented Aug 11, 2017

☔ The latest upstream changes (presumably #1229) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelfletchercgy
Copy link
Contributor Author

Rebased over master.

@alexcrichton
Copy link
Member

@bors: r+

Thanks @michaelfletchercgy!

@bors
Copy link
Contributor

bors commented Aug 12, 2017

📌 Commit bc99cc0 has been approved by alexcrichton

bors added a commit that referenced this pull request Aug 12, 2017
…ed, r=alexcrichton

Fix 'show' so it displays helpful information if the active toolchain is not installed.

Fixed 'show' so that it displays helpful information if the active toolchain is not installed.

```
$ export RUSTUP_TOOLCHAIN=beta
$ rustup show
Default host: x86_64-unknown-linux-gnu
installed toolchains
--------------------

stable-x86_64-unknown-linux-gnu
nightly-x86_64-unknown-linux-gnu

active toolchain
----------------

(error: override toolchain 'beta' is not installed, the RUSTUP_TOOLCHAIN environment variable specifies an uninstalled toolchain)
```

Fixes #1178
@bors
Copy link
Contributor

bors commented Aug 12, 2017

⌛ Testing commit bc99cc0 with merge 001c71e...

@bors
Copy link
Contributor

bors commented Aug 12, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 001c71e to master...

@bors bors merged commit bc99cc0 into rust-lang:master Aug 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants