or_fun_call: lint Option::get_or_insert too

Author: klensy

clippy_lints/src/methods/or_fun_call.rs

@@ -136,7 +136,7 @@ pub(super) fn check<'tcx>(
         fun_span: Option<Span>,
     ) -> bool {
         // (path, fn_has_argument, methods, suffix)
-        const KNOW_TYPES: [(Symbol, bool, &[Symbol], &str); 4] = [
+        const KNOW_TYPES: [(Symbol, bool, &[Symbol], &str); 5] = [
             (sym::BTreeEntry, false, &[sym::or_insert], "with"),
             (sym::HashMapEntry, false, &[sym::or_insert], "with"),
             (
@@ -145,16 +145,17 @@ pub(super) fn check<'tcx>(
                 &[sym::map_or, sym::ok_or, sym::or, sym::unwrap_or],
                 "else",
             ),
+            (sym::Option, false, &[sym::get_or_insert], "with"),
             (sym::Result, true, &[sym::map_or, sym::or, sym::unwrap_or], "else"),
         ];
 
         if KNOW_TYPES.iter().any(|k| k.2.contains(&name))
             && switch_to_lazy_eval(cx, arg)
             && !contains_return(arg)
             && let self_ty = cx.typeck_results().expr_ty(self_expr)
-            && let Some(&(_, fn_has_arguments, poss, suffix)) =
-                KNOW_TYPES.iter().find(|&&i| is_type_diagnostic_item(cx, self_ty, i.0))
-            && poss.contains(&name)
+            && let Some(&(_, fn_has_arguments, _, suffix)) = KNOW_TYPES
+                .iter()
+                .find(|&&i| is_type_diagnostic_item(cx, self_ty, i.0) && i.2.contains(&name))
         {
             let ctxt = span.ctxt();
             let mut app = Applicability::HasPlaceholders;

clippy_utils/src/sym.rs

@@ -167,6 +167,7 @@ generate! {
     futures_util,
     get,
     get_mut,
+    get_or_insert,
     get_or_insert_with,
     get_unchecked,
     get_unchecked_mut,

tests/ui/or_fun_call.fixed

@@ -435,7 +435,8 @@ fn test_option_get_or_insert() {
         99
     }
     let mut x = Some(42_u8);
-    let _ = x.get_or_insert(g());
+    let _ = x.get_or_insert_with(g);
+    //~^ or_fun_call
 }
 
 fn main() {}

tests/ui/or_fun_call.rs

@@ -436,6 +436,7 @@ fn test_option_get_or_insert() {
     }
     let mut x = Some(42_u8);
     let _ = x.get_or_insert(g());
+    //~^ or_fun_call
 }
 
 fn main() {}

tests/ui/or_fun_call.stderr

@@ -258,5 +258,11 @@ error: function call inside of `map_or`
 LL |         let _ = x.map_or(g(), f);
    |                   ^^^^^^^^^^^^^^ help: try: `map_or_else(|_| g(), f)`
 
-error: aborting due to 40 previous errors
+error: function call inside of `get_or_insert`
+  --> tests/ui/or_fun_call.rs:438:15
+   |
+LL |     let _ = x.get_or_insert(g());
+   |               ^^^^^^^^^^^^^^^^^^ help: try: `get_or_insert_with(g)`
+
+error: aborting due to 41 previous errors