Merge branch 'macro-use' into HEAD

clippy_lints/src/utils/author.rs

@@ -4,6 +4,7 @@
 #![allow(print_stdout, use_debug)]
 
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::hir;
 use rustc::hir::{Expr, ExprKind, QPath, TyKind, Pat, PatKind, BindingAnnotation, StmtKind, DeclKind, Stmt};
 use rustc::hir::intravisit::{NestedVisitorMap, Visitor};

clippy_lints/src/utils/conf.rs

@@ -2,6 +2,7 @@
 
 #![deny(missing_docs_in_private_items)]
 
+use lazy_static::lazy_static;
 use std::{env, fmt, fs, io, path};
 use std::io::Read;
 use syntax::{ast, codemap};
@@ -86,10 +87,10 @@ macro_rules! define_Conf {
         //
         #[allow(rust_2018_idioms)]
         mod helpers {
+            use serde_derive::Deserialize;
             /// Type used to store lint configuration.
             #[derive(Deserialize)]
-            #[serde(rename_all="kebab-case")]
-            #[serde(deny_unknown_fields)]
+            #[serde(rename_all="kebab-case", deny_unknown_fields)]
             pub struct Conf {
                 $(#[$doc] #[serde(default=$rust_name_str)] #[serde(with=$rust_name_str)]
                           pub $rust_name: define_Conf!(TY $($ty)+),)+

clippy_lints/src/utils/higher.rs

@@ -3,6 +3,7 @@
 
 #![deny(missing_docs_in_private_items)]
 
+use if_chain::if_chain;
 use rustc::{hir, ty};
 use rustc::lint::LateContext;
 use syntax::ast;

clippy_lints/src/utils/inspector.rs

@@ -3,6 +3,7 @@
 //! checks for attributes
 
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::hir;
 use rustc::hir::print;
 use syntax::ast::Attribute;

clippy_lints/src/utils/internal_lints.rs

@@ -1,4 +1,5 @@
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::hir::*;
 use rustc::hir;
 use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};

clippy_lints/src/utils/mod.rs

@@ -1,4 +1,6 @@
 use crate::reexport::*;
+use matches::matches;
+use if_chain::if_chain;
 use rustc::hir;
 use rustc::hir::*;
 use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};

clippy_lints/src/utils/sugg.rs

@@ -3,6 +3,7 @@
 // currently ignores lifetimes and generics
 #![allow(use_self)]
 
+use matches::matches;
 use rustc::hir;
 use rustc::lint::{EarlyContext, LateContext, LintContext};
 use rustc_errors;