Skip to content

Commit 8c8cc42

Browse files
committed
Auto merge of #146862 - matthiaskrgr:rollup-1zqootr, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang/rust#143857 (Port #[macro_export] to the new attribute parsing infrastructure) - rust-lang/rust#146486 (Improve `core::sync::atomic` coverage) - rust-lang/rust#146606 (ci: x86_64-gnu-tools: Add `--test-args` regression test) - rust-lang/rust#146639 (std: merge definitions of `StdioPipes`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3b2796c + bfa277f commit 8c8cc42

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

clippy_lints/src/macro_metavars_in_unsafe.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ use itertools::Itertools;
55
use rustc_hir::def_id::LocalDefId;
66
use rustc_hir::intravisit::{Visitor, walk_block, walk_expr, walk_stmt};
77
use rustc_hir::{BlockCheckMode, Expr, ExprKind, HirId, Stmt, UnsafeSource};
8+
use rustc_hir::attrs::AttributeKind;
9+
use rustc_hir::find_attr;
810
use rustc_lint::{LateContext, LateLintPass, Level, LintContext};
911
use rustc_middle::lint::LevelAndSource;
1012
use rustc_session::impl_lint_pass;
11-
use rustc_span::{Span, SyntaxContext, sym};
13+
use rustc_span::{Span, SyntaxContext};
1214
use std::collections::BTreeMap;
1315
use std::collections::btree_map::Entry;
1416

@@ -146,7 +148,8 @@ struct BodyVisitor<'a, 'tcx> {
146148
}
147149

148150
fn is_public_macro(cx: &LateContext<'_>, def_id: LocalDefId) -> bool {
149-
(cx.effective_visibilities.is_exported(def_id) || cx.tcx.has_attr(def_id, sym::macro_export))
151+
( cx.effective_visibilities.is_exported(def_id) ||
152+
find_attr!(cx.tcx.get_all_attrs(def_id), AttributeKind::MacroExport{..}) )
150153
&& !cx.tcx.is_doc_hidden(def_id)
151154
}
152155

0 commit comments

Comments
 (0)