From 9a5b9962283ed432cf98c8aff9db3104c18209a8 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Mon, 2 Sep 2019 23:26:04 +0900 Subject: [PATCH] Allow deref_addrof in macros --- clippy_lints/src/reference.rs | 3 ++- tests/ui/deref_addrof_macro.rs | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/ui/deref_addrof_macro.rs diff --git a/clippy_lints/src/reference.rs b/clippy_lints/src/reference.rs index 35e214faae8..54582c6015c 100644 --- a/clippy_lints/src/reference.rs +++ b/clippy_lints/src/reference.rs @@ -1,4 +1,4 @@ -use crate::utils::{snippet_with_applicability, span_lint_and_sugg}; +use crate::utils::{in_macro, snippet_with_applicability, span_lint_and_sugg}; use if_chain::if_chain; use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass}; use rustc::{declare_lint_pass, declare_tool_lint}; @@ -38,6 +38,7 @@ impl EarlyLintPass for DerefAddrOf { if_chain! { if let ExprKind::Unary(UnOp::Deref, ref deref_target) = e.node; if let ExprKind::AddrOf(_, ref addrof_target) = without_parens(deref_target).node; + if !in_macro(addrof_target.span); then { let mut applicability = Applicability::MachineApplicable; span_lint_and_sugg( diff --git a/tests/ui/deref_addrof_macro.rs b/tests/ui/deref_addrof_macro.rs new file mode 100644 index 00000000000..dcebd6c6e29 --- /dev/null +++ b/tests/ui/deref_addrof_macro.rs @@ -0,0 +1,10 @@ +macro_rules! m { + ($($x:tt),*) => { &[$(($x, stringify!(x)),)*] }; +} + +#[warn(clippy::deref_addrof)] +fn f() -> [(i32, &'static str); 3] { + *m![1, 2, 3] // should be fine +} + +fn main() {}