Revert part of #5393 #5465
Merged
Revert part of #5393 #5465
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
Commit 0b530c3 (which this commit mostly reverts) did some refactoring around the `target_dir` function. However, it introduced a bug because it meant that where `CARGO_TARGET_DIR` was specified but `--target-dir` was not, the value from `CARGO_TARGET_DIR` was ignored.
|
@bors r+ |
|
📌 Commit 695bc5e has been approved by |
|
⌛ Testing commit 695bc5e with merge 168f15274db3d9e906e432c4a211fda5b03746d7... |
|
What actually happens here is that, in Cargo, we always call However, RLS does not always call I'll try to find a way to guarantee that Cargo and RLS behave similarly here.... |
|
💔 Test failed - status-travis |
bors
added a commit
that referenced
this pull request
May 3, 2018
Fix target_dir handling for RLS Supersedes and closes #5465
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
May 3, 2018
Update Cargo This should fix RLS cc rust-lang#50379, rust-lang/cargo#5465
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.
Commit 0b530c3 (which this commit mostly reverts) did some refactoring around the
target_dirfunction. However, it introduced a bug because it meant that whereCARGO_TARGET_DIRwas specified but--target-dirwas not, the value fromCARGO_TARGET_DIRwas ignored.r? @matklad
This bug is causing RLS tests to fail in the Rust repo (see rust-lang/rust#50379 (comment)) because on Linux, the src directory is write-protected. This bug causes Rust build's
CARGO_TARGET_DIRto be ignored by the RLS tests so that they write files into the src directory (CWD) rather than the target directory.