Rollup merge of rust-lang#122495 - Manishearth:rustdoc-👻👻👻, r=GuillaumeGomez

Visually mark 👻hidden👻 items with document-hidden-items Fixes rust-lang#122485 This adds a 👻 in the item list (much like the 🔒 used for private items), and also shows `#[doc(hidden)]` in the code view, where `pub(crate)` etc gets shown for private items. This does not do anything for enum variants, if people have ideas. I think we can just show the attribute.

Author: matthiaskrgr

src/librustdoc/clean/inline.rs

@@ -62,6 +62,9 @@ pub(crate) fn try_inline(
  attrs_without_docs.as_ref().map(|(attrs, def_id)| (&attrs[..], *def_id));
 
  let import_def_id = attrs.and_then(|(_, def_id)| def_id);
+
+ let (attrs, cfg) = merge_attrs(cx, load_attrs(cx, did), attrs);
+
  let kind = match res {
  Res::Def(DefKind::Trait, did) => {
  record_extern_fqn(cx, did, ItemType::Trait);
@@ -131,7 +134,7 @@ pub(crate) fn try_inline(
  cx.with_param_env(did, |cx| clean::ConstantItem(build_const(cx, did)))
  }
  Res::Def(DefKind::Macro(kind), did) => {
- let mac = build_macro(cx, did, name, import_def_id, kind);
+ let mac = build_macro(cx, did, name, import_def_id, kind, attrs.is_doc_hidden());
 
  let type_kind = match kind {
  MacroKind::Bang => ItemType::Macro,
@@ -144,7 +147,6 @@ pub(crate) fn try_inline(
  _ => return None,
  };
 
- let (attrs, cfg) = merge_attrs(cx, load_attrs(cx, did), attrs);
  cx.inlined.insert(did.into());
  let mut item =
  clean::Item::from_def_id_and_attrs_and_parts(did, Some(name), kind, Box::new(attrs), cfg);
@@ -751,14 +753,22 @@ fn build_macro(
  name: Symbol,
  import_def_id: Option<DefId>,
  macro_kind: MacroKind,
+ is_doc_hidden: bool,
 ) -> clean::ItemKind {
  match CStore::from_tcx(cx.tcx).load_macro_untracked(def_id, cx.tcx) {
  LoadedMacro::MacroDef(item_def, _) => match macro_kind {
  MacroKind::Bang => {
  if let ast::ItemKind::MacroDef(ref def) = item_def.kind {
  let vis = cx.tcx.visibility(import_def_id.unwrap_or(def_id));
  clean::MacroItem(clean::Macro {
- source: utils::display_macro_source(cx, name, def, def_id, vis),
+ source: utils::display_macro_source(
+ cx,
+ name,
+ def,
+ def_id,
+ vis,
+ is_doc_hidden,
+ ),
  })
  } else {
  unreachable!()

src/librustdoc/clean/mod.rs

@@ -2794,7 +2794,8 @@ fn clean_maybe_renamed_item<'tcx>(
  ItemKind::Macro(ref macro_def, MacroKind::Bang) => {
  let ty_vis = cx.tcx.visibility(def_id);
  MacroItem(Macro {
- source: display_macro_source(cx, name, macro_def, def_id, ty_vis),
+ // FIXME this shouldn't be false
+ source: display_macro_source(cx, name, macro_def, def_id, ty_vis, false),
  })
  }
  ItemKind::Macro(_, macro_kind) => clean_proc_macro(item, &mut name, macro_kind, cx),

src/librustdoc/clean/types.rs

@@ -1161,7 +1161,7 @@ impl Attributes {
  false
  }
 
- fn is_doc_hidden(&self) -> bool {
+ pub(crate) fn is_doc_hidden(&self) -> bool {
  self.has_doc_flag(sym::hidden)
  }
 

src/librustdoc/clean/utils.rs

@@ -625,6 +625,7 @@ pub(super) fn display_macro_source(
  def: &ast::MacroDef,
  def_id: DefId,
  vis: ty::Visibility<DefId>,
+ is_doc_hidden: bool,
 ) -> String {
  // Extract the spans of all matchers. They represent the "interface" of the macro.
  let matchers = def.body.tokens.chunks(4).map(|arm| &arm[0]);
@@ -635,15 +636,15 @@ pub(super) fn display_macro_source(
  if matchers.len() <= 1 {
  format!(
  "{vis}macro {name}{matchers} {{\n ...\n}}",
- vis = visibility_to_src_with_space(Some(vis), cx.tcx, def_id),
+ vis = visibility_to_src_with_space(Some(vis), cx.tcx, def_id, is_doc_hidden),
  matchers = matchers
  .map(|matcher| render_macro_matcher(cx.tcx, matcher))
  .collect::<String>(),
  )
  } else {
  format!(
  "{vis}macro {name} {{\n{arms}}}",
- vis = visibility_to_src_with_space(Some(vis), cx.tcx, def_id),
+ vis = visibility_to_src_with_space(Some(vis), cx.tcx, def_id, is_doc_hidden),
  arms = render_macro_arms(cx.tcx, matchers, ","),
  )
  }

src/librustdoc/html/format.rs

@@ -29,8 +29,7 @@ use rustc_target::spec::abi::Abi;
 use itertools::Itertools;
 
 use crate::clean::{
- self, types::ExternalLocation, utils::find_nearest_parent_module, ExternalCrate, ItemId,
- PrimitiveType,
+ self, types::ExternalLocation, utils::find_nearest_parent_module, ExternalCrate, PrimitiveType,
 };
 use crate::formats::cache::Cache;
 use crate::formats::item_type::ItemType;
@@ -1506,20 +1505,18 @@ impl clean::FnDecl {
 }
 
 pub(crate) fn visibility_print_with_space<'a, 'tcx: 'a>(
- visibility: Option<ty::Visibility<DefId>>,
- item_did: ItemId,
+ item: &clean::Item,
  cx: &'a Context<'tcx>,
 ) -> impl Display + 'a + Captures<'tcx> {
  use std::fmt::Write as _;
-
- let to_print: Cow<'static, str> = match visibility {
+ let vis: Cow<'static, str> = match item.visibility(cx.tcx()) {
  None => "".into(),
  Some(ty::Visibility::Public) => "pub ".into(),
  Some(ty::Visibility::Restricted(vis_did)) => {
  // FIXME(camelid): This may not work correctly if `item_did` is a module.
  // However, rustdoc currently never displays a module's
  // visibility, so it shouldn't matter.
- let parent_module = find_nearest_parent_module(cx.tcx(), item_did.expect_def_id());
+ let parent_module = find_nearest_parent_module(cx.tcx(), item.item_id.expect_def_id());
 
  if vis_did.is_crate_root() {
  "pub(crate) ".into()
@@ -1547,7 +1544,15 @@ pub(crate) fn visibility_print_with_space<'a, 'tcx: 'a>(
  }
  }
  };
- display_fn(move |f| f.write_str(&to_print))
+
+ let is_doc_hidden = item.is_doc_hidden();
+ display_fn(move |f| {
+ if is_doc_hidden {
+ f.write_str("#[doc(hidden)] ")?;
+ }
+
+ f.write_str(&vis)
+ })
 }
 
 /// This function is the same as print_with_space, except that it renders no links.
@@ -1557,8 +1562,9 @@ pub(crate) fn visibility_to_src_with_space<'a, 'tcx: 'a>(
  visibility: Option<ty::Visibility<DefId>>,
  tcx: TyCtxt<'tcx>,
  item_did: DefId,
+ is_doc_hidden: bool,
 ) -> impl Display + 'a + Captures<'tcx> {
- let to_print: Cow<'static, str> = match visibility {
+ let vis: Cow<'static, str> = match visibility {
  None => "".into(),
  Some(ty::Visibility::Public) => "pub ".into(),
  Some(ty::Visibility::Restricted(vis_did)) => {
@@ -1582,7 +1588,12 @@ pub(crate) fn visibility_to_src_with_space<'a, 'tcx: 'a>(
  }
  }
  };
- display_fn(move |f| f.write_str(&to_print))
+ display_fn(move |f| {
+ if is_doc_hidden {
+ f.write_str("#[doc(hidden)] ")?;
+ }
+ f.write_str(&vis)
+ })
 }
 
 pub(crate) trait PrintWithSpace {

src/librustdoc/html/render/mod.rs

@@ -883,7 +883,7 @@ fn assoc_const(
  w,
  "{indent}{vis}const <a{href} class=\"constant\">{name}</a>{generics}: {ty}",
  indent = " ".repeat(indent),
- vis = visibility_print_with_space(it.visibility(tcx), it.item_id, cx),
+ vis = visibility_print_with_space(it, cx),
  href = assoc_href_attr(it, link, cx),
  name = it.name.as_ref().unwrap(),
  generics = generics.print(cx),
@@ -912,12 +912,11 @@ fn assoc_type(
  indent: usize,
  cx: &Context<'_>,
 ) {
- let tcx = cx.tcx();
  write!(
  w,
  "{indent}{vis}type <a{href} class=\"associatedtype\">{name}</a>{generics}",
  indent = " ".repeat(indent),
- vis = visibility_print_with_space(it.visibility(tcx), it.item_id, cx),
+ vis = visibility_print_with_space(it, cx),
  href = assoc_href_attr(it, link, cx),
  name = it.name.as_ref().unwrap(),
  generics = generics.print(cx),
@@ -945,7 +944,7 @@ fn assoc_method(
  let tcx = cx.tcx();
  let header = meth.fn_header(tcx).expect("Trying to get header from a non-function item");
  let name = meth.name.as_ref().unwrap();
- let vis = visibility_print_with_space(meth.visibility(tcx), meth.item_id, cx).to_string();
+ let vis = visibility_print_with_space(meth, cx).to_string();
  let defaultness = print_default_space(meth.is_default());
  // FIXME: Once https://github.com/rust-lang/rust/issues/67792 is implemented, we can remove
  // this condition.