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

Display the cargo and rustup home paths #1914

Merged
merged 1 commit into from
Jul 1, 2019
Merged

Display the cargo and rustup home paths #1914

merged 1 commit into from
Jul 1, 2019

Conversation

skilly-lily
Copy link

@skilly-lily skilly-lily commented Jun 26, 2019

During interactive installation, the user will see the cargo home
directory as well as the rustup home directory. They will also see the
environment variables which control these paths.

Fixes #1907

@skilly-lily
Copy link
Author

CI builds are failing due to some windows-only hard link error. Doesn't seem related to this change.

All errors look like this:

---- warn_about_and_remove_stray_hash stdout ----
thread 'warn_about_and_remove_stray_hash' panicked at 'called `Result::unwrap()`
on an `Err` value: Os { code: 1142, kind: Other, message: "An attempt was made to
create more links on a file than the file system supports." }',
src\libcore\result.rs:997:5

@@ -74,6 +74,15 @@ Cargo's bin directory, located at:

{cargo_home_bin}

This can be modified with the CARGO_HOME envorinment variable.

Rustup metadata and toolchains will be installed the Rustup home
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar error here - "will be installed the" -> "will be installed into the"

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Also fixed misspelling of environment.

Copy link
Contributor

@rbtcollins rbtcollins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to me other than the minor grammar error. @kinnison is there anything we need to do copyright wise - DCO, just accept it, etc?

@kinnison
Copy link
Contributor

If you're okay with the content then I'd like to see the commits squashed, there's no need for a "grammar fix" or "spelling fix" commit. Then it can merge.

@skilly-lily
Copy link
Author

@kinnison @rbtcollins

  • Spelling and grammar fixed
  • Commits squashed

Let me know if there's anything else needed.

@kinnison kinnison merged commit 0f695e0 into rust-lang:master Jul 1, 2019
@skilly-lily skilly-lily deleted the Explicit-home-vars branch July 1, 2019 20:26
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.

Rustup does not tell users where the toolchains will be installed
3 participants