Skip to content

Commit c74aac9

Browse files
committed
Auto merge of #4073 - euclio:serde-derive, r=Manishearth
use `derive` feature over `serde_derive` crate changelog: replace `serde_derive` dependency with `serde`'s derive feature
2 parents d056ea6 + 9ede56f commit c74aac9

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ rustc_tools_util = { version = "0.1.1", path = "rustc_tools_util"}
4848
cargo_metadata = "0.7.1"
4949
compiletest_rs = { version = "0.3.22", features = ["tmp"] }
5050
lazy_static = "1.0"
51-
serde_derive = "1.0"
5251
clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
53-
serde = "1.0"
52+
serde = { version = "1.0", features = ["derive"] }
5453
derive-new = "0.5"
5554

5655
# A noop dependency that changes in the Rust repository, it's a bit of a hack.

clippy_lints/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ matches = "0.1.7"
2424
quine-mc_cluskey = "0.2.2"
2525
regex-syntax = "0.6"
2626
semver = "0.9.0"
27-
serde = "1.0"
28-
serde_derive = "1.0"
27+
serde = { version = "1.0", features = ["derive"] }
2928
toml = "0.5"
3029
unicode-normalization = "0.1"
3130
pulldown-cmark = "0.5.0"

clippy_lints/src/utils/conf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ macro_rules! define_Conf {
6464
($(#[$doc: meta] ($rust_name: ident, $rust_name_str: expr, $default: expr => $($ty: tt)+),)+) => {
6565
pub use self::helpers::Conf;
6666
mod helpers {
67-
use serde_derive::Deserialize;
67+
use serde::Deserialize;
6868
/// Type used to store lint configuration.
6969
#[derive(Deserialize)]
7070
#[serde(rename_all="kebab-case", deny_unknown_fields)]

0 commit comments

Comments
 (0)