Skip to content

Conversation

@brson
Copy link
Contributor

@brson brson commented Jul 19, 2017

This pulls out the definitions of these functions into a single crate, home, to act as their canonical definition.

This has a bigger impact on rustup, since it is using definitions of all these things, where cargo is just defining cargo_home in terms of std's wrong home_dir.

The definition of cargo_home used here is slightly different than what cargo has today in that it contains a bit of defensive code to avoid allowing CARGO_HOME to be set to .multirust/cargo - this is backwards compatibility code from rustup.

@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor Author

brson commented Jul 19, 2017

The definition of CARGO_HOME here maintains backwards compatibility with old versions of cargo that used $HOME on windows in the same manner as cargo does today.

@alexcrichton
Copy link
Member

@bors: r+

👍

@bors
Copy link
Contributor

bors commented Jul 19, 2017

📌 Commit fdb9f1b has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 19, 2017

⌛ Testing commit fdb9f1b with merge 7c423ec...

bors added a commit that referenced this pull request Jul 19, 2017
Replace homedir definition with home crate

This pulls out the definitions of these functions into a single crate, [home](https://github.com/brson/home), to act as their canonical definition.

This has a bigger impact on rustup, since it is using  definitions of all these things, where cargo is just defining cargo_home in terms of std's wrong home_dir.

The [definition of cargo_home](https://github.com/brson/home/blob/master/src/lib.rs#L179) used here is slightly different than what cargo has today in that it contains a bit of defensive code to avoid allowing `CARGO_HOME` to be set to `.multirust/cargo` - this is backwards compatibility code from rustup.
@bors
Copy link
Contributor

bors commented Jul 19, 2017

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

@bors bors merged commit fdb9f1b into rust-lang:master Jul 19, 2017
@ehuss ehuss added this to the 1.21.0 milestone Feb 6, 2022
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.

5 participants