about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-10 21:36:00 +0000
committerbors <bors@rust-lang.org>2020-11-10 21:36:00 +0000
commit467bf95ab7822d4cd83b514d6c550bf2392eb7d0 (patch)
treec325582a10fc29d0891015d6c77fefcdf82a7e9f
parentdd826b4626c00da53f76f00f02f03556803e9cdb (diff)
parenteffcb52bbf818ca39c57f9beb7d7d63b1e47d1fd (diff)
downloadrust-467bf95ab7822d4cd83b514d6c550bf2392eb7d0.tar.gz
rust-467bf95ab7822d4cd83b514d6c550bf2392eb7d0.zip
Auto merge of #6319 - ebroto:rustup, r=ebroto
Rustup

changelog: none

r? `@ghost`
-rw-r--r--clippy_lints/src/non_expressive_names.rs10
1 files changed, 1 insertions, 9 deletions
diff --git a/clippy_lints/src/non_expressive_names.rs b/clippy_lints/src/non_expressive_names.rs
index 485888fa944..5b42b61fcde 100644
--- a/clippy_lints/src/non_expressive_names.rs
+++ b/clippy_lints/src/non_expressive_names.rs
@@ -1,7 +1,5 @@
 use crate::utils::{span_lint, span_lint_and_then};
-use rustc_ast::ast::{
-    Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, MacCall, Pat, PatKind,
-};
+use rustc_ast::ast::{Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, Pat, PatKind};
 use rustc_ast::visit::{walk_block, walk_expr, walk_pat, Visitor};
 use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_middle::lint::in_external_macro;
@@ -150,9 +148,6 @@ impl<'a, 'tcx, 'b> Visitor<'tcx> for SimilarNamesNameVisitor<'a, 'tcx, 'b> {
             _ => walk_pat(self, pat),
         }
     }
-    fn visit_mac(&mut self, _mac: &MacCall) {
-        // do not check macs
-    }
 }
 
 #[must_use]
@@ -357,9 +352,6 @@ impl<'a, 'tcx> Visitor<'tcx> for SimilarNamesLocalVisitor<'a, 'tcx> {
     fn visit_item(&mut self, _: &Item) {
         // do not recurse into inner items
     }
-    fn visit_mac(&mut self, _mac: &MacCall) {
-        // do not check macs
-    }
 }
 
 impl EarlyLintPass for NonExpressiveNames {