Skip to content

Commit

Permalink
Auto merge of #7385 - ehuss:fix-tar-features, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Sep 19, 2019
2 parents eadbaec + 079b3fb commit 3596cb8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/cargo-test-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ glob = "0.3"
lazy_static = "1.0"
remove_dir_all = "0.5"
serde_json = "1.0"
tar = "0.4"
tar = { version = "0.4.18", default-features = false }
url = "2.0"

0 comments on commit 3596cb8

Please sign in to comment.