Correct suggestion when dereferencing enough, calling a function

ThibsG · ThibsG · commit 6d1ccbf46682 · 2021-11-20T09:40:11.000+01:00
diff --git a/clippy_lints/src/methods/search_is_some.rs b/clippy_lints/src/methods/search_is_some.rs
@@ -248,7 +248,6 @@ impl<'tcx> Delegate<'tcx> for DerefDelegate<'_, 'tcx> {
                         let expr = self.cx.tcx.hir().expect_expr(cmt.hir_id);
                         let arg_ty_kind = self.cx.typeck_results().expr_ty(expr).kind();
 
-                        // Note: this should always be true, as `find` only gives us a reference which are not mutable
                         if matches!(arg_ty_kind, ty::Ref(_, _, Mutability::Not)) {
                             let start_span = Span::new(self.next_pos, span.lo(), span.ctxt());
                             let start_snip =
@@ -261,10 +260,10 @@ impl<'tcx> Delegate<'tcx> for DerefDelegate<'_, 'tcx> {
                             };
                             self.suggestion_start.push_str(&ident_sugg);
                             self.next_pos = span.hi();
+                            return;
                         } else {
                             self.applicability = Applicability::Unspecified;
                         }
-                        return;
                     }
                 }
 
diff --git a/tests/ui/search_is_some_fixable_none.fixed b/tests/ui/search_is_some_fixable_none.fixed
@@ -102,10 +102,17 @@ mod issue7392 {
         *x == 9
     }
 
+    fn simple_fn(x: u32) -> bool {
+        x == 78
+    }
+
     fn more_projections() {
         let x = 19;
         let ppx: &u32 = &x;
         let _ = ![ppx].iter().any(|ppp_x: &&u32| please(ppp_x));
         let _ = ![String::from("Hey hey")].iter().any(|s| s.len() == 2);
+
+        let v = vec![3, 2, 1, 0];
+        let _ = !v.iter().any(|x| simple_fn(*x));
     }
 }
diff --git a/tests/ui/search_is_some_fixable_none.rs b/tests/ui/search_is_some_fixable_none.rs
@@ -106,10 +106,17 @@ mod issue7392 {
         *x == 9
     }
 
+    fn simple_fn(x: u32) -> bool {
+        x == 78
+    }
+
     fn more_projections() {
         let x = 19;
         let ppx: &u32 = &x;
         let _ = [ppx].iter().find(|ppp_x: &&&u32| please(**ppp_x)).is_none();
         let _ = [String::from("Hey hey")].iter().find(|s| s.len() == 2).is_none();
+
+        let v = vec![3, 2, 1, 0];
+        let _ = v.iter().find(|x| simple_fn(**x)).is_none();
     }
 }
diff --git a/tests/ui/search_is_some_fixable_none.stderr b/tests/ui/search_is_some_fixable_none.stderr
@@ -170,16 +170,22 @@ LL |         let _ = vfoo.iter().find(|sub| sub[1..4].len() == 3).is_none();
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `!_.any()` instead: `!vfoo.iter().any(|sub| sub[1..4].len() == 3)`
 
 error: called `is_none()` after searching an `Iterator` with `find`
-  --> $DIR/search_is_some_fixable_none.rs:112:17
+  --> $DIR/search_is_some_fixable_none.rs:116:17
    |
 LL |         let _ = [ppx].iter().find(|ppp_x: &&&u32| please(**ppp_x)).is_none();
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `!_.any()` instead: `![ppx].iter().any(|ppp_x: &&u32| please(ppp_x))`
 
 error: called `is_none()` after searching an `Iterator` with `find`
-  --> $DIR/search_is_some_fixable_none.rs:113:17
+  --> $DIR/search_is_some_fixable_none.rs:117:17
    |
 LL |         let _ = [String::from("Hey hey")].iter().find(|s| s.len() == 2).is_none();
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `!_.any()` instead: `![String::from("Hey hey")].iter().any(|s| s.len() == 2)`
 
-error: aborting due to 28 previous errors
+error: called `is_none()` after searching an `Iterator` with `find`
+  --> $DIR/search_is_some_fixable_none.rs:120:17
+   |
+LL |         let _ = v.iter().find(|x| simple_fn(**x)).is_none();
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `!_.any()` instead: `!v.iter().any(|x| simple_fn(*x))`
+
+error: aborting due to 29 previous errors
 
diff --git a/tests/ui/search_is_some_fixable_some.fixed b/tests/ui/search_is_some_fixable_some.fixed
@@ -103,10 +103,17 @@ mod issue7392 {
         *x == 9
     }
 
+    fn simple_fn(x: u32) -> bool {
+        x == 78
+    }
+
     fn more_projections() {
         let x = 19;
         let ppx: &u32 = &x;
         let _ = [ppx].iter().any(|ppp_x: &&u32| please(ppp_x));
         let _ = [String::from("Hey hey")].iter().any(|s| s.len() == 2);
+
+        let v = vec![3, 2, 1, 0];
+        let _ = v.iter().any(|x| simple_fn(*x));
     }
 }
diff --git a/tests/ui/search_is_some_fixable_some.rs b/tests/ui/search_is_some_fixable_some.rs
@@ -105,10 +105,17 @@ mod issue7392 {
         *x == 9
     }
 
+    fn simple_fn(x: u32) -> bool {
+        x == 78
+    }
+
     fn more_projections() {
         let x = 19;
         let ppx: &u32 = &x;
         let _ = [ppx].iter().find(|ppp_x: &&&u32| please(**ppp_x)).is_some();
         let _ = [String::from("Hey hey")].iter().find(|s| s.len() == 2).is_some();
+
+        let v = vec![3, 2, 1, 0];
+        let _ = v.iter().find(|x| simple_fn(**x)).is_some();
     }
 }
diff --git a/tests/ui/search_is_some_fixable_some.stderr b/tests/ui/search_is_some_fixable_some.stderr
@@ -161,16 +161,22 @@ LL |         let _ = vfoo.iter().find(|sub| sub[1..4].len() == 3).is_some();
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `any()` instead: `any(|sub| sub[1..4].len() == 3)`
 
 error: called `is_some()` after searching an `Iterator` with `find`
-  --> $DIR/search_is_some_fixable_some.rs:111:30
+  --> $DIR/search_is_some_fixable_some.rs:115:30
    |
 LL |         let _ = [ppx].iter().find(|ppp_x: &&&u32| please(**ppp_x)).is_some();
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `any()` instead: `any(|ppp_x: &&u32| please(ppp_x))`
 
 error: called `is_some()` after searching an `Iterator` with `find`
-  --> $DIR/search_is_some_fixable_some.rs:112:50
+  --> $DIR/search_is_some_fixable_some.rs:116:50
    |
 LL |         let _ = [String::from("Hey hey")].iter().find(|s| s.len() == 2).is_some();
    |                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `any()` instead: `any(|s| s.len() == 2)`
 
-error: aborting due to 28 previous errors
+error: called `is_some()` after searching an `Iterator` with `find`
+  --> $DIR/search_is_some_fixable_some.rs:119:26
+   |
+LL |         let _ = v.iter().find(|x| simple_fn(**x)).is_some();
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `any()` instead: `any(|x| simple_fn(*x))`
+
+error: aborting due to 29 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,6 @@ impl<'tcx> Delegate<'tcx> for DerefDelegate<'_, 'tcx> {`
`248`	`248`	`let expr = self.cx.tcx.hir().expect_expr(cmt.hir_id);`
`249`	`249`	`let arg_ty_kind = self.cx.typeck_results().expr_ty(expr).kind();`
`250`	`250`
`251`		- // Note: this should always be true, as `find` only gives us a reference which are not mutable
`252`	`251`	`if matches!(arg_ty_kind, ty::Ref(_, _, Mutability::Not)) {`
`253`	`252`	`let start_span = Span::new(self.next_pos, span.lo(), span.ctxt());`
`254`	`253`	`let start_snip =`
`@@ -261,10 +260,10 @@ impl<'tcx> Delegate<'tcx> for DerefDelegate<'_, 'tcx> {`
`261`	`260`	`};`
`262`	`261`	`self.suggestion_start.push_str(&ident_sugg);`
`263`	`262`	`self.next_pos = span.hi();`
	`263`	`+ return;`
`264`	`264`	`} else {`
`265`	`265`	`self.applicability = Applicability::Unspecified;`
`266`	`266`	`}`
`267`		`- return;`
`268`	`267`	`}`
`269`	`268`	`}`
`270`	`269`
Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,17 @@ mod issue7392 {`
`102`	`102`	`*x == 9`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ fn simple_fn(x: u32) -> bool {`
	`106`	`+ x == 78`
	`107`	`+ }`
	`108`	`+`
`105`	`109`	`fn more_projections() {`
`106`	`110`	`let x = 19;`
`107`	`111`	`let ppx: &u32 = &x;`
`108`	`112`	`let _ = ![ppx].iter().any(\|ppp_x: &&u32\| please(ppp_x));`
`109`	`113`	`let _ = ![String::from("Hey hey")].iter().any(\|s\| s.len() == 2);`
	`114`	`+`
	`115`	`+ let v = vec![3, 2, 1, 0];`
	`116`	`+ let _ = !v.iter().any(\|x\| simple_fn(*x));`
`110`	`117`	`}`
`111`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,17 @@ mod issue7392 {`
`106`	`106`	`*x == 9`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ fn simple_fn(x: u32) -> bool {`
	`110`	`+ x == 78`
	`111`	`+ }`
	`112`	`+`
`109`	`113`	`fn more_projections() {`
`110`	`114`	`let x = 19;`
`111`	`115`	`let ppx: &u32 = &x;`
`112`	`116`	`let _ = [ppx].iter().find(\|ppp_x: &&&u32\| please(**ppp_x)).is_none();`
`113`	`117`	`let _ = [String::from("Hey hey")].iter().find(\|s\| s.len() == 2).is_none();`
	`118`	`+`
	`119`	`+ let v = vec![3, 2, 1, 0];`
	`120`	`+ let _ = v.iter().find(\|x\| simple_fn(**x)).is_none();`
`114`	`121`	`}`
`115`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,17 @@ mod issue7392 {`
`103`	`103`	`*x == 9`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ fn simple_fn(x: u32) -> bool {`
	`107`	`+ x == 78`
	`108`	`+ }`
	`109`	`+`
`106`	`110`	`fn more_projections() {`
`107`	`111`	`let x = 19;`
`108`	`112`	`let ppx: &u32 = &x;`
`109`	`113`	`let _ = [ppx].iter().any(\|ppp_x: &&u32\| please(ppp_x));`
`110`	`114`	`let _ = [String::from("Hey hey")].iter().any(\|s\| s.len() == 2);`
	`115`	`+`
	`116`	`+ let v = vec![3, 2, 1, 0];`
	`117`	`+ let _ = v.iter().any(\|x\| simple_fn(*x));`
`111`	`118`	`}`
`112`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,17 @@ mod issue7392 {`
`105`	`105`	`*x == 9`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ fn simple_fn(x: u32) -> bool {`
	`109`	`+ x == 78`
	`110`	`+ }`
	`111`	`+`
`108`	`112`	`fn more_projections() {`
`109`	`113`	`let x = 19;`
`110`	`114`	`let ppx: &u32 = &x;`
`111`	`115`	`let _ = [ppx].iter().find(\|ppp_x: &&&u32\| please(**ppp_x)).is_some();`
`112`	`116`	`let _ = [String::from("Hey hey")].iter().find(\|s\| s.len() == 2).is_some();`
	`117`	`+`
	`118`	`+ let v = vec![3, 2, 1, 0];`
	`119`	`+ let _ = v.iter().find(\|x\| simple_fn(**x)).is_some();`
`113`	`120`	`}`
`114`	`121`	`}`