From 10f468e679c0e6a6c6dc0e94431f3d63bf3e33e0 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 2 May 2016 10:52:55 +0200
Subject: [PATCH 1/2] don't lint similar_names inside #[test] functions

---
 src/non_expressive_names.rs | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/non_expressive_names.rs b/src/non_expressive_names.rs
index a6f0571c499..c1232fe64b1 100644
--- a/src/non_expressive_names.rs
+++ b/src/non_expressive_names.rs
@@ -2,7 +2,8 @@ use rustc::lint::*;
 use syntax::codemap::Span;
 use syntax::parse::token::InternedString;
 use syntax::ast::*;
-use syntax::visit::{self, FnKind};
+use syntax::attr;
+use syntax::visit;
 use utils::{span_lint_and_then, in_macro, span_lint};
 
 /// **What it does:** This lint warns about names that are very similar and thus confusing
@@ -237,24 +238,28 @@ impl<'v, 'a, 'b> visit::Visitor<'v> for SimilarNamesLocalVisitor<'a, 'b> {
         });
     }
     fn visit_item(&mut self, _: &'v Item) {
-        // do nothing
+        // do not recurse into inner items
     }
 }
 
 impl EarlyLintPass for NonExpressiveNames {
-    fn check_fn(&mut self, cx: &EarlyContext, _: FnKind, decl: &FnDecl, blk: &Block, _: Span, _: NodeId) {
-        let mut visitor = SimilarNamesLocalVisitor {
-            names: Vec::new(),
-            cx: cx,
-            lint: &self,
-            single_char_names: Vec::new(),
-        };
-        // initialize with function arguments
-        for arg in &decl.inputs {
-            visit::walk_pat(&mut SimilarNamesNameVisitor(&mut visitor), &arg.pat);
+    fn check_item(&mut self, cx: &EarlyContext, item: &Item) {
+        if let ItemKind::Fn(ref decl, _, _, _, _, ref blk) = item.node {
+            if !attr::contains_name(&item.attrs, "test") {
+                let mut visitor = SimilarNamesLocalVisitor {
+                    names: Vec::new(),
+                    cx: cx,
+                    lint: &self,
+                    single_char_names: Vec::new(),
+                };
+                // initialize with function arguments
+                for arg in &decl.inputs {
+                    visit::walk_pat(&mut SimilarNamesNameVisitor(&mut visitor), &arg.pat);
+                }
+                // walk all other bindings
+                visit::walk_block(&mut visitor, blk);
+            }
         }
-        // walk all other bindings
-        visit::walk_block(&mut visitor, blk);
     }
 }
 

From ee35c3722a25dda475a4828c5474795ddde285e2 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 2 May 2016 10:53:09 +0200
Subject: [PATCH 2/2] similar_names should be allow-by-default

---
 src/non_expressive_names.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/non_expressive_names.rs b/src/non_expressive_names.rs
index c1232fe64b1..0c6fdc37066 100644
--- a/src/non_expressive_names.rs
+++ b/src/non_expressive_names.rs
@@ -15,7 +15,7 @@ use utils::{span_lint_and_then, in_macro, span_lint};
 /// **Example:** `checked_exp` and `checked_expr`
 declare_lint! {
     pub SIMILAR_NAMES,
-    Warn,
+    Allow,
     "similarly named items and bindings"
 }