diff options
| author | bors <bors@rust-lang.org> | 2025-09-21 20:33:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-21 20:33:36 +0000 |
| commit | 9f32ccf35fb877270bc44a86a126440f04d676d0 (patch) | |
| tree | b3e4579913cdffec38689506b82f04faa3b717af /src/tools | |
| parent | 7e4b8d702fedccc9c7803773a22c2e053ac3b004 (diff) | |
| parent | adfc111fff3598dd24a94da518501ca127c1afd0 (diff) | |
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
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/macro_metavars_in_unsafe.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/clippy/clippy_lints/src/macro_metavars_in_unsafe.rs b/src/tools/clippy/clippy_lints/src/macro_metavars_in_unsafe.rs index 9071c9c95f9..c5acaf09993 100644 --- a/src/tools/clippy/clippy_lints/src/macro_metavars_in_unsafe.rs +++ b/src/tools/clippy/clippy_lints/src/macro_metavars_in_unsafe.rs @@ -5,10 +5,12 @@ use itertools::Itertools; use rustc_hir::def_id::LocalDefId; use rustc_hir::intravisit::{Visitor, walk_block, walk_expr, walk_stmt}; use rustc_hir::{BlockCheckMode, Expr, ExprKind, HirId, Stmt, UnsafeSource}; +use rustc_hir::attrs::AttributeKind; +use rustc_hir::find_attr; use rustc_lint::{LateContext, LateLintPass, Level, LintContext}; use rustc_middle::lint::LevelAndSource; use rustc_session::impl_lint_pass; -use rustc_span::{Span, SyntaxContext, sym}; +use rustc_span::{Span, SyntaxContext}; use std::collections::BTreeMap; use std::collections::btree_map::Entry; @@ -146,7 +148,8 @@ struct BodyVisitor<'a, 'tcx> { } fn is_public_macro(cx: &LateContext<'_>, def_id: LocalDefId) -> bool { - (cx.effective_visibilities.is_exported(def_id) || cx.tcx.has_attr(def_id, sym::macro_export)) + ( cx.effective_visibilities.is_exported(def_id) || + find_attr!(cx.tcx.get_all_attrs(def_id), AttributeKind::MacroExport{..}) ) && !cx.tcx.is_doc_hidden(def_id) } |
