Fix some duplicate artifact problems.#7385
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 19, 2019
Merged
Conversation
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
I think this is probably best fixed in rust-lang/rust itself with https://github.com/rust-lang/rust/tree/master/src/tools/rustc-workspace-hack, although disabling features of |
ehuss
force-pushed
the
fix-tar-features
branch
from
060b706 to
079b3fb
Compare
Contributor
Author
|
Oh...I knew that. 😛 |
Member
|
@bors: r+ |
Contributor
|
📌 Commit 079b3fb has been approved by |
bors
added
S-waiting-on-bors
Contributor
bors
added a commit
that referenced
this pull request
Sep 19, 2019
Fix some duplicate artifact problems. The recent cargo update failed because of duplicate artifacts with rls. `tar` should mirror what the main manifest contains. Partially revert #7374 by adding `serde` back to `url`. Unfortunately the `lsp-types` crate (used by rls) needs this feature. Unless anyone has a good idea on how to handle that, I don't think it can be removed. Unblocks cargo update, which I'd like to get done before the beta branch.
Contributor
|
☀️ Test successful - checks-azure |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
The recent cargo update failed because of duplicate artifacts with rls.
tarshould mirror what the main manifest contains.Partially revert #7374 by adding
serdeback tourl. Unfortunately thelsp-typescrate (used by rls) needs this feature. Unless anyone has a good idea on how to handle that, I don't think it can be removed.Unblocks cargo update, which I'd like to get done before the beta branch.