Rename ~/.multirust to ~/.rustup #830
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustup.sh is already modified to use |
|
☔ The latest upstream changes (presumably #812) made this pull request unmergeable. Please resolve the merge conflicts. |
|
r+ from me Thanks for writing it as you did, this is some crazy logic to follow, but all makes sense to me! (and was easy to read) |
This will silently do the upgrade when rustup is run, and uses several defenses to avoid breaking due to interactions with rustup.sh.
|
Rebased. |
|
@bors r+ |
|
📌 Commit a07ee8c has been approved by |
bors
added a commit
that referenced
this pull request
Dec 1, 2016
Rename ~/.multirust to ~/.rustup This renames the ~/.multirust directory to ~/.rustup. The logic for the upgrade is in `do_rustup_home_upgrade`, and is defensive against errors. It amounts to moving an unrecognized `~/.rustup` folder to `~/.rustup.sh`, then moving a `~/.multirust` dir to `~/.rustup`. If the upgrade fails then rustup will silently continue using `~/.multirust`, though this code path doesn't have tests, and is unlikely to happen... After the upgrade, or during initial install this also sets up `~/.multirust` as a symlink to `~/.rustup` in case there are tools depending on it. This is intended to be temporary, to avoid breakage while getting it done quickly. This needs some more manual testing before deployment but is ready for review. r? @alexcrichton
|
💥 Test timed out |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Dec 2, 2016
Rename ~/.multirust to ~/.rustup This renames the ~/.multirust directory to ~/.rustup. The logic for the upgrade is in `do_rustup_home_upgrade`, and is defensive against errors. It amounts to moving an unrecognized `~/.rustup` folder to `~/.rustup.sh`, then moving a `~/.multirust` dir to `~/.rustup`. If the upgrade fails then rustup will silently continue using `~/.multirust`, though this code path doesn't have tests, and is unlikely to happen... After the upgrade, or during initial install this also sets up `~/.multirust` as a symlink to `~/.rustup` in case there are tools depending on it. This is intended to be temporary, to avoid breakage while getting it done quickly. This needs some more manual testing before deployment but is ready for review. r? @alexcrichton
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This renames the ~/.multirust directory to ~/.rustup. The logic for the upgrade is in
do_rustup_home_upgrade, and is defensive against errors. It amounts to moving an unrecognized~/.rustupfolder to~/.rustup.sh, then moving a~/.multirustdir to~/.rustup.If the upgrade fails then rustup will silently continue using
~/.multirust, though this code path doesn't have tests, and is unlikely to happen...After the upgrade, or during initial install this also sets up
~/.multirustas a symlink to~/.rustupin case there are tools depending on it. This is intended to be temporary, to avoid breakage while getting it done quickly.This needs some more manual testing before deployment but is ready for review.
r? @alexcrichton