about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-19 06:20:01 +0000
committerbors <bors@rust-lang.org>2019-08-19 06:20:01 +0000
commit2ed80d4d81a4851ac6bb3d86598f324a522c8b30 (patch)
tree293ae7ace86aecd8fb6725367ed583ed983c8762
parentf01a0c0e08b5905f174d30201b0cb927f5cad500 (diff)
parent88f417e446282d7c32c648e30815aebcb4d2c8b4 (diff)
downloadrust-2ed80d4d81a4851ac6bb3d86598f324a522c8b30.tar.gz
rust-2ed80d4d81a4851ac6bb3d86598f324a522c8b30.zip
Auto merge of #4410 - matthiaskrgr:url_serde_feat, r=phansch
deps: try to fix build in rustc repo: enable serde feature url dep in clippy-lints crate

This might fix the problem in https://github.com/rust-lang/rust/pull/63587
I didn't have time to test this yet.
r? @flip1995
changelog: enable serde feature of url dep in clippy-lints to depened on it in the same way cargo does
-rw-r--r--clippy_lints/Cargo.toml3
1 files changed, 2 insertions, 1 deletions
diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
index 956bc858a17..48133cc5b02 100644
--- a/clippy_lints/Cargo.toml
+++ b/clippy_lints/Cargo.toml
@@ -28,7 +28,8 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.5.3"
 unicode-normalization = "0.1"
 pulldown-cmark = "0.5.3"
-url = "2.1.0"
+url = { version =  "2.1.0", features = ["serde"] } # cargo requires serde feat in its url dep
+# see https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864
 if_chain = "1.0.0"
 smallvec = { version = "0.6.5", features = ["union"] }