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

Don't use .cargo for custom CARGO_HOME #1148

Merged
merged 1 commit into from
Jan 11, 2015
Merged

Conversation

flaper87
Copy link
Contributor

Users changing cargo's home directory expect it to be used as top path
instead of there being a .cargo hidden dir in it. There are some cases
following this pattern one of them is python's virtualenvwrapper, which
uses WORKON_HOME as a home dir for everything.

This patch removes the extra .cargo and assumes that CARGO_HOME is the
real path a user wants to use as a homedir for cargo.

Users changing cargo's home directory expect it to be used as top path
instead of there being a `.cargo` hidden dir in it. There are some cases
following this pattern one of them is python's virtualenvwrapper, which
uses `WORK_HOME` as a home dir for everything.

This patch removes the extra `.cargo` and assumes that CARGO_HOME is the
real path a user wants to use as a homedir for cargo.
@flaper87
Copy link
Contributor Author

@brson r?

@brson
Copy link
Contributor

brson commented Jan 10, 2015

I think we need @alexcrichton's review here.

@larsbergstrom
Copy link

👍

@huonw
Copy link
Member

huonw commented Jan 11, 2015

(Aren't we meant to be using the XDG variables by default per #148 as well?)

@larsbergstrom
Copy link

@huonw My only concern is that for Servo, we need to be able to not write any files outside of the enlistment directory.

@huonw
Copy link
Member

huonw commented Jan 11, 2015

@larsbergstrom, yeah, that would only be the default (rather than ~ as it seems to be today?), not replacing the ability to customise it with CARGO_HOME.

@alexcrichton
Copy link
Member

I think the order of precedence we would have (in theory) would be:

  1. CARGO_HOME
  2. XDG variables
  3. $HOME/.cargo

Which is to say that I think we can still fit in the XDG specification here.

@alexcrichton
Copy link
Member

@bors: r+ bef8095

@bors
Copy link
Contributor

bors commented Jan 11, 2015

⌛ Testing commit bef8095 with merge b9a80db...

@bors
Copy link
Contributor

bors commented Jan 11, 2015

💔 Test failed - cargo-win-64

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Jan 11, 2015

⌛ Testing commit bef8095 with merge ed06187...

@bors
Copy link
Contributor

bors commented Jan 11, 2015

💔 Test failed - cargo-win-64

@alexcrichton
Copy link
Member

@bors: retry

bors added a commit that referenced this pull request Jan 11, 2015
Users changing cargo's home directory expect it to be used as top path
instead of there being a `.cargo` hidden dir in it. There are some cases
following this pattern one of them is python's virtualenvwrapper, which
uses `WORK_HOME` as a home dir for everything.

This patch removes the extra `.cargo` and assumes that CARGO_HOME is the
real path a user wants to use as a homedir for cargo.
@bors
Copy link
Contributor

bors commented Jan 11, 2015

⌛ Testing commit bef8095 with merge cff6aad...

@bors
Copy link
Contributor

bors commented Jan 11, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32, cargo-win-64

@bors bors merged commit bef8095 into rust-lang:master Jan 11, 2015
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.

6 participants