From f411c18a734a0c4d020ac578ccc3b5b8a7814f8f Mon Sep 17 00:00:00 2001 From: kyoto7250 <50972773+kyoto7250@users.noreply.github.com> Date: Sat, 18 Jun 2022 17:41:26 +0900 Subject: [PATCH] check macro_backtrace only --- clippy_lints/src/copies.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/clippy_lints/src/copies.rs b/clippy_lints/src/copies.rs index f0f2c7420..673744d90 100644 --- a/clippy_lints/src/copies.rs +++ b/clippy_lints/src/copies.rs @@ -8,7 +8,7 @@ use clippy_utils::{ use core::iter; use rustc_errors::Applicability; use rustc_hir::intravisit; -use rustc_hir::{BinOpKind, Block, Expr, ExprKind, HirId, QPath, Stmt, StmtKind}; +use rustc_hir::{BinOpKind, Block, Expr, ExprKind, HirId, Stmt, StmtKind}; use rustc_lint::{LateContext, LateLintPass}; use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_span::hygiene::walk_chain; @@ -389,13 +389,11 @@ fn contains_acceptable_macro(cx: &LateContext<'_>, block: &Block<'_>) -> bool { } fn acceptable_macro(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool { - if let ExprKind::Call(call_expr, _) = expr.kind - && let ExprKind::Path(QPath::Resolved(None, path)) = call_expr.kind - && macro_backtrace(path.span).last().map_or(false, |macro_call| - matches!( - &cx.tcx.get_diagnostic_name(macro_call.def_id), - Some(sym::todo_macro | sym::unimplemented_macro) - ) + if macro_backtrace(expr.span).last().map_or(false, |macro_call| + matches!( + &cx.tcx.get_diagnostic_name(macro_call.def_id), + Some(sym::todo_macro | sym::unimplemented_macro) + ) ) { return true; }