From 621588b2583de340cb8b81f0a11d9916b7c51c3b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 19 Aug 2016 11:27:12 -0400
Subject: [PATCH] Revert "Disable clippy until Manishearth/rust-clippy#1174 is
 fixed"

This reverts commit 2bc1d62e50b799e06b51742a8490b546395e04ec.
---
 serde/Cargo.toml                           | 2 +-
 serde_codegen/Cargo.toml                   | 2 +-
 serde_codegen_internals/Cargo.toml         | 2 +-
 serde_macros/Cargo.toml                    | 1 +
 serde_macros/tests/run-pass/identity-op.rs | 2 +-
 testing/Cargo.toml                         | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/serde/Cargo.toml b/serde/Cargo.toml
index 1e741936..30b89fbc 100644
--- a/serde/Cargo.toml
+++ b/serde/Cargo.toml
@@ -18,7 +18,7 @@ std = []
 unstable = []
 alloc = ["unstable"]
 collections = ["alloc"]
-unstable-testing = ["unstable", "std"]
+unstable-testing = ["clippy", "unstable", "std"]
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml
index f5b20603..1395ca4f 100644
--- a/serde_codegen/Cargo.toml
+++ b/serde_codegen/Cargo.toml
@@ -14,7 +14,7 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
 [features]
 default = ["with-syntex"]
 unstable = ["quasi_macros"]
-unstable-testing = []
+unstable-testing = ["clippy"]
 with-syntex = [
     "quasi/with-syntex",
     "quasi_codegen",
diff --git a/serde_codegen_internals/Cargo.toml b/serde_codegen_internals/Cargo.toml
index 3181eb19..62b24f2e 100644
--- a/serde_codegen_internals/Cargo.toml
+++ b/serde_codegen_internals/Cargo.toml
@@ -12,7 +12,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 
 [features]
 default = ["with-syntex"]
-unstable-testing = []
+unstable-testing = ["clippy"]
 with-syntex = ["syntex_syntax", "syntex_errors"]
 
 [dependencies]
diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml
index 4f41e676..07e85110 100644
--- a/serde_macros/Cargo.toml
+++ b/serde_macros/Cargo.toml
@@ -17,6 +17,7 @@ plugin = true
 
 [features]
 unstable-testing = [
+    "clippy",
     "skeptic",
     "serde_json",
     "serde/unstable-testing",
diff --git a/serde_macros/tests/run-pass/identity-op.rs b/serde_macros/tests/run-pass/identity-op.rs
index a82f100d..dcf8117a 100644
--- a/serde_macros/tests/run-pass/identity-op.rs
+++ b/serde_macros/tests/run-pass/identity-op.rs
@@ -1,5 +1,5 @@
 #![feature(custom_derive, plugin)]
-#![plugin(serde_macros)]
+#![plugin(serde_macros, clippy)]
 
 #![deny(identity_op)]
 
diff --git a/testing/Cargo.toml b/testing/Cargo.toml
index 471ac26d..2604154c 100644
--- a/testing/Cargo.toml
+++ b/testing/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["serialization"]
 build = "build.rs"
 
 [features]
-unstable-testing = ["serde/unstable-testing", "serde_codegen/unstable-testing"]
+unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
 
 [build-dependencies]
 serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] }