Skip to content

Canonicalize CARGO_HOME fallback on Windows#2681

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:cargo-env-home
May 13, 2016
Merged

Canonicalize CARGO_HOME fallback on Windows#2681
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:cargo-env-home

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

This commit ensures that we always return the same fallback value on Windows
regardless of whichever shell we happen to be run from. We do this by removing
the $HOME environment variable which std::env::home_dir will inspect to
force it to fall back to the system APIs. If the old directory exists then we
favor that one, but otherwise we favor locations like C:\Users\$user

Supercedes and closes #2604

@rust-highfive

Copy link
Copy Markdown

r? @wycats

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

@alexcrichton

Copy link
Copy Markdown
Member Author

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned wycats May 12, 2016
@brson

brson commented May 12, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 12, 2016

Copy link
Copy Markdown
Contributor

📌 Commit ec6a28c has been approved by brson

@bors

bors commented May 12, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit ec6a28c with merge b6e7bf4...

@bors

bors commented May 12, 2016

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-msvc-64

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson 165258c

@bors

bors commented May 12, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 165258c with merge 04e1016...

@bors

bors commented May 12, 2016

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-msvc-32

This commit ensures that we always return the same fallback value on Windows
regardless of whichever shell we happen to be run from. We do this by removing
the `$HOME` environment variable which `std::env::home_dir` will inspect to
force it to fall back to the system APIs. If the old directory exists then we
favor that one, but otherwise we favor locations like `C:\Users\$user`

Supercedes and closes rust-lang#2604
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented May 13, 2016

Copy link
Copy Markdown
Contributor

📌 Commit ee0b711 has been approved by brson

@bors

bors commented May 13, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit ee0b711 with merge 0907288...

bors added a commit that referenced this pull request May 13, 2016
Canonicalize CARGO_HOME fallback on Windows

This commit ensures that we always return the same fallback value on Windows
regardless of whichever shell we happen to be run from. We do this by removing
the `$HOME` environment variable which `std::env::home_dir` will inspect to
force it to fall back to the system APIs. If the old directory exists then we
favor that one, but otherwise we favor locations like `C:\Users\$user`

Supercedes and closes #2604
@bors

bors commented May 13, 2016

Copy link
Copy Markdown
Contributor

@bors bors merged commit ee0b711 into rust-lang:master May 13, 2016
@alexcrichton alexcrichton deleted the cargo-env-home branch May 18, 2016 00:34
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