Skip to content

Commit

Permalink
Auto merge of rust-lang#7255 - whatisaphone:feat/similar-names-wparam…
Browse files Browse the repository at this point in the history
…-lparam, r=giraffate

Allow wparam and lparam in similar_names

`wparam` and `lparam` are often used as generic parameter names in win32 (for example [WindowProc](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms633573(v=vs.85))). This PR adds them to the similar_names exception list.

changelog: [`similar_names`] don't treat wparam and lparam as similar
  • Loading branch information
bors committed May 24, 2021
2 parents 297e743 + 2eafec1 commit 41bb092
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions clippy_lints/src/non_expressive_names.rs
Expand Up @@ -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>);
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/similar_names.rs
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/similar_names.stderr
Expand Up @@ -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,
| ^^^^^^
Expand Down

0 comments on commit 41bb092

Please sign in to comment.