Skip to content

Commit 3596cb8

Browse files
committed
Auto merge of #7385 - ehuss:fix-tar-features, r=alexcrichton
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.
2 parents eadbaec + 079b3fb commit 3596cb8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

crates/cargo-test-support/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ glob = "0.3"
1717
lazy_static = "1.0"
1818
remove_dir_all = "0.5"
1919
serde_json = "1.0"
20-
tar = "0.4"
20+
tar = { version = "0.4.18", default-features = false }
2121
url = "2.0"

0 commit comments

Comments
 (0)