From 9016711bf1f43db68f0ba51a9852b65a2270ae61 Mon Sep 17 00:00:00 2001 From: León Orell Valerian Liehr Date: Tue, 29 Oct 2024 02:34:25 +0100 Subject: rustdoc: Treat decl macros like other items --- src/librustdoc/clean/inline.rs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/librustdoc/clean/inline.rs') diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index 97529e420e3..5ddd6188c2d 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -134,11 +134,7 @@ pub(crate) fn try_inline( }) } Res::Def(DefKind::Macro(kind), did) => { - let is_doc_hidden = cx.tcx.is_doc_hidden(did) - || attrs_without_docs - .map(|(attrs, _)| attrs) - .is_some_and(|attrs| utils::attrs_have_doc_flag(attrs.iter(), sym::hidden)); - let mac = build_macro(cx, did, name, import_def_id, kind, is_doc_hidden); + let mac = build_macro(cx, did, name, kind); let type_kind = match kind { MacroKind::Bang => ItemType::Macro, @@ -740,18 +736,14 @@ fn build_macro( cx: &mut DocContext<'_>, def_id: DefId, name: Symbol, - import_def_id: Option, macro_kind: MacroKind, - is_doc_hidden: bool, ) -> clean::ItemKind { match CStore::from_tcx(cx.tcx).load_macro_untracked(def_id, cx.tcx) { LoadedMacro::MacroDef { def, .. } => match macro_kind { - MacroKind::Bang => { - let vis = cx.tcx.visibility(import_def_id.map(|d| d.to_def_id()).unwrap_or(def_id)); - clean::MacroItem(clean::Macro { - source: utils::display_macro_source(cx, name, &def, def_id, vis, is_doc_hidden), - }) - } + MacroKind::Bang => clean::MacroItem(clean::Macro { + source: utils::display_macro_source(cx, name, &def), + macro_rules: def.macro_rules, + }), MacroKind::Derive | MacroKind::Attr => { clean::ProcMacroItem(clean::ProcMacro { kind: macro_kind, helpers: Vec::new() }) } -- cgit 1.4.1-3-g733a5