mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #4073 - euclio:serde-derive, r=Manishearth

Browse Source 
use `derive` feature over `serde_derive` crate

changelog: replace `serde_derive` dependency with `serde`'s derive feature
This commit is contained in:
bors 2019-05-09 17:09:54 +00:00
commit c74aac9d0c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -48,9 +48,8 @@ rustc_tools_util = { version = "0.1.1", path = "rustc_tools_util"}
cargo_metadata = "0.7.1" cargo_metadata = "0.7.1"
compiletest_rs = { version = "0.3.22", features = ["tmp"] } compiletest_rs = { version = "0.3.22", features = ["tmp"] }
lazy_static = "1.0" lazy_static = "1.0"
serde_derive = "1.0"
clippy-mini-macro-test = { version = "0.2", path = "mini-macro" } clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
serde = "1.0" serde = { version = "1.0", features = ["derive"] }
derive-new = "0.5" derive-new = "0.5"
# A noop dependency that changes in the Rust repository, it's a bit of a hack. # A noop dependency that changes in the Rust repository, it's a bit of a hack.

3
clippy_lints/Cargo.toml
View File

@ -24,8 +24,7 @@ matches = "0.1.7"
quine-mc_cluskey = "0.2.2" quine-mc_cluskey = "0.2.2"
regex-syntax = "0.6" regex-syntax = "0.6"
semver = "0.9.0" semver = "0.9.0"
serde = "1.0" serde = { version = "1.0", features = ["derive"] }
serde_derive = "1.0"
toml = "0.5" toml = "0.5"
unicode-normalization = "0.1" unicode-normalization = "0.1"
pulldown-cmark = "0.5.0" pulldown-cmark = "0.5.0"

2
clippy_lints/src/utils/conf.rs
View File

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