look for should_panic attribute directly instead

Author: y21

clippy_lints/src/attrs.rs

@@ -1,10 +1,10 @@
 //! checks for attributes
 
 use clippy_utils::diagnostics::{span_lint, span_lint_and_help, span_lint_and_sugg, span_lint_and_then};
+use clippy_utils::is_from_proc_macro;
 use clippy_utils::macros::{is_panic, macro_backtrace};
 use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::source::{first_line_of_span, is_present_in_source, snippet_opt, without_block_comments};
-use clippy_utils::{is_from_proc_macro, match_def_path, paths};
 use if_chain::if_chain;
 use rustc_ast::token::{Token, TokenKind};
 use rustc_ast::tokenstream::TokenTree;
@@ -13,7 +13,7 @@ use rustc_ast::{
 };
 use rustc_errors::Applicability;
 use rustc_hir::{
-    Block, Expr, ExprKind, ImplItem, ImplItemKind, Item, ItemKind, QPath, StmtKind, TraitFn, TraitItem, TraitItemKind,
+    Block, Expr, ExprKind, ImplItem, ImplItemKind, Item, ItemKind, StmtKind, TraitFn, TraitItem, TraitItemKind,
 };
 use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, Level, LintContext};
 use rustc_middle::lint::in_external_macro;
@@ -482,6 +482,9 @@ impl<'tcx> LateLintPass<'tcx> for Attributes {
                 }
             }
         }
+        if attr.has_name(sym::should_panic) {
+            check_should_panic_reason(cx, attr);
+        }
     }
 
     fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
@@ -558,42 +561,6 @@ impl<'tcx> LateLintPass<'tcx> for Attributes {
                     }
                 }
             },
-            ItemKind::Const(_, body_id) => {
-                // Looking for #[should_panic] attributes without a specified message means
-                // looking for the expanded #[test] const item.
-                //
-                // #[test] attributes expand to a const item that initializes `test::TestDescAndFn`.
-                //
-                // `#[test] #[should_panic] fn f() {}`
-                // becomes roughly:
-                // ```
-                // const f: test::TestDescAndFn = test::TestDescAndFn {
-                //   ...,
-                //   testfn: test::StaticTestFn(|| test::assert_result(f()))
-                // }
-                // ```
-                // The #[should_panic] attribute, along with its span, is on the `f`.
-
-                let body = cx.tcx.hir().body(body_id);
-
-                if let ExprKind::Struct(QPath::Resolved(_, path), fields, _) = body.value.kind
-                    && let Some(did) = path.res.opt_def_id()
-                    && match_def_path(cx, did, &paths::TEST_DESC_AND_FN)
-                    && let Some(testfn_field) = fields.iter().find(|field| field.ident.name == sym!(testfn))
-                    // test::StaticTestFn(|| ..)
-                    && let ExprKind::Call(_, [closure]) = testfn_field.expr.kind
-                    && let ExprKind::Closure(closure) = closure.kind
-                    // test::assert_result(f())
-                    //                     ^ get this `DefId` and its should_panic attr
-                    && let ExprKind::Call(_, [fn_call_closure]) = cx.tcx.hir().body(closure.body).value.kind
-                    && let ExprKind::Call(callee, _) = fn_call_closure.kind
-                    && let ExprKind::Path(QPath::Resolved(_, path)) = callee.kind
-                    && let Some(test_function_did) = path.res.opt_def_id()
-                    && let Some(attribute) = cx.tcx.get_attr(test_function_did, sym::should_panic)
-                {
-                    check_should_panic_reason(cx, attribute);
-                }
-            },
             _ => {},
         }
     }