From bc9459f9d457c23471852a6f20c9d867385d8429 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 7 Aug 2021 18:11:49 +0200 Subject: [PATCH 1/4] similar_names: allow "iter" and "item" --- clippy_lints/src/non_expressive_names.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/clippy_lints/src/non_expressive_names.rs b/clippy_lints/src/non_expressive_names.rs index dc55b103eb6..ac21eb5275f 100644 --- a/clippy_lints/src/non_expressive_names.rs +++ b/clippy_lints/src/non_expressive_names.rs @@ -126,6 +126,7 @@ const ALLOWED_TO_BE_SIMILAR: &[&[&str]] = &[ &["qpath", "path"], &["lit", "lint"], &["wparam", "lparam"], + &["iter", "item"], ]; struct SimilarNamesNameVisitor<'a, 'tcx, 'b>(&'b mut SimilarNamesLocalVisitor<'a, 'tcx>); From 573b89744108f46060e528659706e52a117df8d0 Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Wed, 11 Aug 2021 20:32:26 +0200 Subject: [PATCH 2/4] Add test for similar names "iter" and "item" --- tests/ui/similar_names.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/ui/similar_names.rs b/tests/ui/similar_names.rs index 2b1bc1f4859..ac7a0170fa0 100644 --- a/tests/ui/similar_names.rs +++ b/tests/ui/similar_names.rs @@ -76,6 +76,9 @@ fn main() { // names often used in win32 code (for example WindowProc) let wparam: i32; let lparam: i32; + + let iter: i32; + let item: i32; } fn foo() { From ee63ebe11b900c20a1b8e385286f257f1eaa3a0c Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Wed, 11 Aug 2021 20:35:48 +0200 Subject: [PATCH 3/4] rustfmt --- tests/ui/similar_names.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ui/similar_names.rs b/tests/ui/similar_names.rs index ac7a0170fa0..daa07341457 100644 --- a/tests/ui/similar_names.rs +++ b/tests/ui/similar_names.rs @@ -76,7 +76,7 @@ fn main() { // names often used in win32 code (for example WindowProc) let wparam: i32; let lparam: i32; - + let iter: i32; let item: i32; } From f7784ef534b5db0c6a8b45224fc24fb7195906bd Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Wed, 11 Aug 2021 20:42:01 +0200 Subject: [PATCH 4/4] fix line numbers --- tests/ui/similar_names.stderr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ui/similar_names.stderr b/tests/ui/similar_names.stderr index b24accd962a..f621595abae 100644 --- a/tests/ui/similar_names.stderr +++ b/tests/ui/similar_names.stderr @@ -72,13 +72,13 @@ LL | let parser: i32; | ^^^^^^ error: binding's name is too similar to existing binding - --> $DIR/similar_names.rs:85:16 + --> $DIR/similar_names.rs:88:16 | LL | bpple: sprang, | ^^^^^^ | note: existing binding defined here - --> $DIR/similar_names.rs:84:16 + --> $DIR/similar_names.rs:87:16 | LL | apple: spring, | ^^^^^^