fixup! Add invalid null pointer usage lint.

Author: boxdot

clippy_lints/src/ptr.rs

@@ -215,25 +215,21 @@ fn check_invalid_ptr_usage<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
         if let ExprKind::Path(ref qpath) = fun.kind;
         if let Some(fun_def_id) = cx.qpath_res(qpath, fun.hir_id).opt_def_id();
         let fun_def_path = cx.get_def_path(fun_def_id).into_iter().map(Symbol::to_ident_string).collect::<Vec<_>>();
-        if let Some(arg) = INVALID_NULL_PTR_USAGE_TABLE.iter().find_map(|(fn_path, arg_indices)| {
-            if fn_path == &fun_def_path {
-                arg_indices.iter().find_map(|arg_idx| {
-                    args.get(*arg_idx).filter(|arg| is_null_path(cx, arg))
-                })
-            } else {
-                None
-            }
-        });
+        if let Some(&(_, arg_indices)) = INVALID_NULL_PTR_USAGE_TABLE.iter().find(|&&(fn_path, _)| fn_path == &fun_def_path);
         then {
-            span_lint_and_sugg(
-                cx,
-                INVALID_NULL_PTR_USAGE,
-                arg.span,
-                "pointer must be non-null",
-                "change this to",
-                "core::ptr::NonNull::dangling().as_ptr()".to_string(),
-                Applicability::MachineApplicable,
-            );
+            for &arg_idx in arg_indices {
+                if let Some(arg) = args.get(arg_idx).filter(|arg| is_null_path(cx, arg)) {
+                    span_lint_and_sugg(
+                        cx,
+                        INVALID_NULL_PTR_USAGE,
+                        arg.span,
+                        "pointer must be non-null",
+                        "change this to",
+                        "core::ptr::NonNull::dangling().as_ptr()".to_string(),
+                        Applicability::MachineApplicable,
+                    );
+                }
+            }
         }
     }
 }