From c7676356b88b58a6eaab192a094baab239de7137 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Thu, 19 Jul 2018 00:24:19 -0700
Subject: [PATCH] Remove import of matches

---
 clippy_lints/src/block_in_if_condition.rs      | 1 +
 clippy_lints/src/functions.rs                  | 1 +
 clippy_lints/src/items_after_statements.rs     | 1 +
 clippy_lints/src/lib.rs                        | 2 --
 clippy_lints/src/lifetimes.rs                  | 1 +
 clippy_lints/src/methods.rs                    | 1 +
 clippy_lints/src/misc.rs                       | 1 +
 clippy_lints/src/needless_pass_by_value.rs     | 1 +
 clippy_lints/src/swap.rs                       | 1 +
 clippy_lints/src/trivially_copy_pass_by_ref.rs | 1 +
 clippy_lints/src/utils/mod.rs                  | 1 +
 clippy_lints/src/utils/sugg.rs                 | 1 +
 12 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/clippy_lints/src/block_in_if_condition.rs b/clippy_lints/src/block_in_if_condition.rs
index 7d4d667da9a..f57a3571b57 100644
--- a/clippy_lints/src/block_in_if_condition.rs
+++ b/clippy_lints/src/block_in_if_condition.rs
@@ -1,3 +1,4 @@
+use matches::matches;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::{declare_lint, lint_array};
 use rustc::hir::*;
diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs
index f58a91bc211..d9f50d652d3 100644
--- a/clippy_lints/src/functions.rs
+++ b/clippy_lints/src/functions.rs
@@ -1,3 +1,4 @@
+use matches::matches;
 use rustc::hir::intravisit;
 use rustc::hir;
 use rustc::lint::*;
diff --git a/clippy_lints/src/items_after_statements.rs b/clippy_lints/src/items_after_statements.rs
index 61eaa7bea6e..1d0382748ee 100644
--- a/clippy_lints/src/items_after_statements.rs
+++ b/clippy_lints/src/items_after_statements.rs
@@ -1,5 +1,6 @@
 //! lint when items are used after statements
 
+use matches::matches;
 use rustc::lint::*;
 use rustc::{declare_lint, lint_array};
 use syntax::ast::*;
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index ac52c82b602..6b6df849001 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -18,8 +18,6 @@
 use toml;
 use rustc_plugin;
 
-#[macro_use]
-extern crate matches as matches_macro;
 
 #[macro_use]
 extern crate if_chain;
diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs
index edd144d8de4..7762c4d1cb5 100644
--- a/clippy_lints/src/lifetimes.rs
+++ b/clippy_lints/src/lifetimes.rs
@@ -1,4 +1,5 @@
 use crate::reexport::*;
+use matches::matches;
 use rustc::lint::*;
 use rustc::{declare_lint, lint_array};
 use rustc::hir::def::Def;
diff --git a/clippy_lints/src/methods.rs b/clippy_lints/src/methods.rs
index f878102a52e..30c2941efe4 100644
--- a/clippy_lints/src/methods.rs
+++ b/clippy_lints/src/methods.rs
@@ -1,3 +1,4 @@
+use matches::matches;
 use rustc::hir;
 use rustc::lint::*;
 use rustc::{declare_lint, lint_array};
diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs
index c517d4a44ee..34afa1585ac 100644
--- a/clippy_lints/src/misc.rs
+++ b/clippy_lints/src/misc.rs
@@ -1,4 +1,5 @@
 use crate::reexport::*;
+use matches::matches;
 use rustc::hir::*;
 use rustc::hir::intravisit::FnKind;
 use rustc::lint::*;
diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs
index 6b961eedeb7..3300c9f23fb 100644
--- a/clippy_lints/src/needless_pass_by_value.rs
+++ b/clippy_lints/src/needless_pass_by_value.rs
@@ -1,3 +1,4 @@
+use matches::matches;
 use rustc::hir::*;
 use rustc::hir::map::*;
 use rustc::hir::intravisit::FnKind;
diff --git a/clippy_lints/src/swap.rs b/clippy_lints/src/swap.rs
index d8bf6e567f6..e76cf78f8d1 100644
--- a/clippy_lints/src/swap.rs
+++ b/clippy_lints/src/swap.rs
@@ -1,3 +1,4 @@
+use matches::matches;
 use rustc::hir::*;
 use rustc::lint::*;
 use rustc::{declare_lint, lint_array};
diff --git a/clippy_lints/src/trivially_copy_pass_by_ref.rs b/clippy_lints/src/trivially_copy_pass_by_ref.rs
index 57d9ddf3955..8d2b21058cf 100644
--- a/clippy_lints/src/trivially_copy_pass_by_ref.rs
+++ b/clippy_lints/src/trivially_copy_pass_by_ref.rs
@@ -1,5 +1,6 @@
 use std::cmp;
 
+use matches::matches;
 use rustc::hir::*;
 use rustc::hir::map::*;
 use rustc::hir::intravisit::FnKind;
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index c38a925efed..1888321827d 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -1,4 +1,5 @@
 use crate::reexport::*;
+use matches::matches;
 use rustc::hir;
 use rustc::hir::*;
 use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs
index ff9424289c5..c7e1e59f063 100644
--- a/clippy_lints/src/utils/sugg.rs
+++ b/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;