about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Simon <john@whatisaph.one>2021-05-20 10:12:54 -0400
committerJohn Simon <john@whatisaph.one>2021-05-20 10:20:14 -0400
commit2eafec182d82fe85bcf88f78bd76ea143b5a6fba (patch)
treeb1c877a883b77976a1dd54b962f6d3d32b922f8b
parent60826e77c3753e2d9d4b37228d2395dc7c171baf (diff)
downloadrust-2eafec182d82fe85bcf88f78bd76ea143b5a6fba.tar.gz
rust-2eafec182d82fe85bcf88f78bd76ea143b5a6fba.zip
Allow wparam and lparam in similar_names
-rw-r--r--clippy_lints/src/non_expressive_names.rs1
-rw-r--r--tests/ui/similar_names.rs4
-rw-r--r--tests/ui/similar_names.stderr4
3 files changed, 7 insertions, 2 deletions
diff --git a/clippy_lints/src/non_expressive_names.rs b/clippy_lints/src/non_expressive_names.rs
index 52661416de6..7b12363a3fe 100644
--- a/clippy_lints/src/non_expressive_names.rs
+++ b/clippy_lints/src/non_expressive_names.rs
@@ -125,6 +125,7 @@ const ALLOWED_TO_BE_SIMILAR: &[&[&str]] = &[
     &["args", "arms"],
     &["qpath", "path"],
     &["lit", "lint"],
+    &["wparam", "lparam"],
 ];
 
 struct SimilarNamesNameVisitor<'a, 'tcx, 'b>(&'b mut SimilarNamesLocalVisitor<'a, 'tcx>);
diff --git a/tests/ui/similar_names.rs b/tests/ui/similar_names.rs
index 5981980988b..2b1bc1f4859 100644
--- a/tests/ui/similar_names.rs
+++ b/tests/ui/similar_names.rs
@@ -72,6 +72,10 @@ fn main() {
     let rx1: i32;
     let tx_cake: i32;
     let rx_cake: i32;
+
+    // names often used in win32 code (for example WindowProc)
+    let wparam: i32;
+    let lparam: i32;
 }
 
 fn foo() {
diff --git a/tests/ui/similar_names.stderr b/tests/ui/similar_names.stderr
index 0256f126a94..a7eb2be0778 100644
--- a/tests/ui/similar_names.stderr
+++ b/tests/ui/similar_names.stderr
@@ -92,13 +92,13 @@ LL |     let parsee: i32;
    |         ^^^^^^
 
 error: binding's name is too similar to existing binding
-  --> $DIR/similar_names.rs:81:16
+  --> $DIR/similar_names.rs:85:16
    |
 LL |         bpple: sprang,
    |                ^^^^^^
    |
 note: existing binding defined here
-  --> $DIR/similar_names.rs:80:16
+  --> $DIR/similar_names.rs:84:16
    |
 LL |         apple: spring,
    |                ^^^^^^