From 1eca73c523c1c0b16c8493d1abc52353883ee556 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Wed, 22 Jun 2016 18:33:09 -0700
Subject: [PATCH] Add clippy support

---
 quasi/Cargo.toml         |  2 ++
 quasi/src/lib.rs         | 10 ++++++----
 quasi_codegen/Cargo.toml |  2 ++
 quasi_codegen/src/lib.rs | 12 +++++++-----
 quasi_macros/Cargo.toml  |  4 ++++
 quasi_macros/src/lib.rs  |  2 ++
 quasi_tests/Cargo.toml   |  6 ++++++
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/quasi/Cargo.toml b/quasi/Cargo.toml
index 05721383..6d96e805 100644
--- a/quasi/Cargo.toml
+++ b/quasi/Cargo.toml
@@ -9,6 +9,8 @@ include = ["Cargo.toml", "src/**/*.rs"]
 
 [features]
 with-syntex = ["syntex_syntax"]
+unstable-testing = ["clippy"]
 
 [dependencies]
 syntex_syntax = { version = "^0.36.0", optional = true }
+clippy = { version = "^0.*", optional = true }
diff --git a/quasi/src/lib.rs b/quasi/src/lib.rs
index 1baad7d3..bace1f4c 100644
--- a/quasi/src/lib.rs
+++ b/quasi/src/lib.rs
@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private))]
+#![cfg_attr(feature = "unstable-testing", feature(plugin))]
+#![cfg_attr(feature = "unstable-testing", plugin(clippy))]
 
 #[macro_use]
 #[cfg(feature = "with-syntex")]
@@ -70,9 +72,9 @@ impl<T: ToTokens> ToTokens for Spanned<T> {
 
 impl<T: ToTokens> ToTokens for Option<T> {
     fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> {
-        match self {
-            &Some(ref t) => t.to_tokens(cx),
-            &None => Vec::new(),
+        match *self {
+            Some(ref t) => t.to_tokens(cx),
+            None => Vec::new(),
         }
     }
 }
@@ -145,7 +147,7 @@ impl ToTokens for ast::WhereClause {
         */
 
         let s = pprust::to_string(|s| {
-            s.print_where_clause(&self)
+            s.print_where_clause(self)
         });
 
         panictry!(parse_tts_from_source_str("<quote expansion>".to_string(), s, cx.cfg(), cx.parse_sess()))
diff --git a/quasi_codegen/Cargo.toml b/quasi_codegen/Cargo.toml
index 53d1c7d8..ce8a93e4 100644
--- a/quasi_codegen/Cargo.toml
+++ b/quasi_codegen/Cargo.toml
@@ -10,8 +10,10 @@ include = ["Cargo.toml", "src/**/*.rs"]
 [features]
 default = ["with-syntex"]
 with-syntex = ["syntex", "syntex_syntax", "aster/with-syntex"]
+unstable-testing = ["clippy"]
 
 [dependencies]
 aster = { version = "^0.19.0", default-features = false }
+clippy = { version = "^0.*", optional = true }
 syntex = { version = "^0.36.0", optional = true }
 syntex_syntax = { version = "^0.36.0", optional = true }
diff --git a/quasi_codegen/src/lib.rs b/quasi_codegen/src/lib.rs
index 22ee68b6..32c0e691 100644
--- a/quasi_codegen/src/lib.rs
+++ b/quasi_codegen/src/lib.rs
@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private))]
+#![cfg_attr(feature = "unstable-testing", feature(plugin))]
+#![cfg_attr(feature = "unstable-testing", plugin(clippy))]
 
 extern crate aster;
 
@@ -41,7 +43,7 @@ use syntax::ptr::P;
 ///
 ///  This is registered as a set of expression syntax extension called quote!
 ///  that lifts its argument token-tree to an AST representing the
-///  construction of the same token tree, with token::SubstNt interpreted
+///  construction of the same token tree, with `token::SubstNt` interpreted
 ///  as antiquotes (splices).
 
 fn expand_quote_tokens<'cx>(
@@ -451,7 +453,7 @@ fn statements_mk_tt(tt: &ast::TokenTree, matcher: bool) -> Result<QuoteStmts, ()
         ast::TokenTree::Token(sp, SubstNt(ident)) => {
             // tt.extend($ident.to_tokens(ext_cx).into_iter())
 
-            let builder = builder.clone().span(sp);
+            let builder = builder.span(sp);
 
             let to_tokens = builder.path()
                 .global()
@@ -486,7 +488,7 @@ fn statements_mk_tt(tt: &ast::TokenTree, matcher: bool) -> Result<QuoteStmts, ()
             statements_mk_tts(&seq[..], matcher)
         }
         ast::TokenTree::Token(sp, ref tok) => {
-            let builder = builder.clone().span(sp);
+            let builder = builder.span(sp);
 
             let e_tok = builder.expr().call()
                 .build(mk_tt_path(&builder, "Token"))
@@ -514,7 +516,7 @@ fn statements_mk_tt(tt: &ast::TokenTree, matcher: bool) -> Result<QuoteStmts, ()
             })
         },
         ast::TokenTree::Sequence(sp, ref seq) if matcher => {
-            let builder = builder.clone().span(sp);
+            let builder = builder.span(sp);
 
             let e_sp = builder.expr().id("_sp");
 
@@ -580,7 +582,7 @@ fn statements_mk_tt(tt: &ast::TokenTree, matcher: bool) -> Result<QuoteStmts, ()
             if idents.is_empty() {
                 return Err(());
             }
-            let builder = builder.clone().span(sp);
+            let builder = builder.span(sp);
             let one_or_more = builder.expr().bool(seq.op == ast::KleeneOp::OneOrMore);
             let mut iter = idents.iter().cloned();
             let first = iter.next().unwrap();
diff --git a/quasi_macros/Cargo.toml b/quasi_macros/Cargo.toml
index 536af098..dee4b00c 100644
--- a/quasi_macros/Cargo.toml
+++ b/quasi_macros/Cargo.toml
@@ -11,7 +11,11 @@ include = ["Cargo.toml", "src/**/*.rs"]
 name = "quasi_macros"
 plugin = true
 
+[features]
+unstable-testing = ["clippy", "quasi/unstable-testing", "quasi_codegen/unstable-testing"]
+
 [dependencies]
+clippy = { version = "^0.*", optional = true }
 quasi_codegen = { version = "^0.13.0", path = "../quasi_codegen", default-features = false }
 
 [dev-dependencies]
diff --git a/quasi_macros/src/lib.rs b/quasi_macros/src/lib.rs
index d750c3a4..9fd1cd97 100644
--- a/quasi_macros/src/lib.rs
+++ b/quasi_macros/src/lib.rs
@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #![feature(plugin_registrar, unboxed_closures, rustc_private)]
+#![cfg_attr(feature = "unstable-testing", feature(plugin))]
+#![cfg_attr(feature = "unstable-testing", plugin(clippy))]
 
 extern crate quasi_codegen;
 extern crate rustc_plugin;
diff --git a/quasi_tests/Cargo.toml b/quasi_tests/Cargo.toml
index 60f68bab..af8d3a10 100644
--- a/quasi_tests/Cargo.toml
+++ b/quasi_tests/Cargo.toml
@@ -7,10 +7,16 @@ description = "A quasi-quoting macro system"
 repository = "https://github.com/erickt/rust-quasi"
 build = "build.rs"
 
+[features]
+unstable-testing = ["clippy", "quasi/unstable-testing", "quasi_codegen/unstable-testing"]
+
 [build-dependencies]
 quasi_codegen = { path = "../quasi_codegen" }
 syntex = { version = "^0.36.0" }
 
+[dependencies]
+clippy = { version = "^0.*", optional = true }
+
 [dev-dependencies]
 aster = { version = "^0.19.0", features = ["with-syntex"] }
 quasi = { path = "../quasi", features = ["with-syntex"] }