Move inherits_doc_hidden function directly into TyCtxt

Author: GuillaumeGomez

compiler/rustc_middle/src/ty/context.rs

@@ -931,6 +931,31 @@ impl<'tcx> TyCtxt<'tcx> {
             self.def_path(def_id).to_string_no_crate_verbose()
         )
     }
+
+    /// Returns `true` if the provided `def_id` has any ancestor with the `#[doc(hidden)]`
+    /// attribute.
+    ///
+    /// It doesn't check if `def_id` itself has this attribute though. You will need to use
+    /// [`TyCtxt::is_doc_hidden`] to get this information.
+    pub fn inherits_doc_hidden(self, mut def_id: LocalDefId) -> bool {
+        let hir = self.hir();
+        while let Some(id) = self.opt_local_parent(def_id) {
+            def_id = id;
+            if self.is_doc_hidden(def_id.to_def_id()) {
+                return true;
+            } else if let Some(node) = hir.find_by_def_id(def_id) &&
+                matches!(
+                    node,
+                    hir::Node::Item(hir::Item { kind: hir::ItemKind::Impl(_), .. }),
+                )
+            {
+                // `impl` blocks stand a bit on their own: unless they have `#[doc(hidden)]` directly
+                // on them, they don't inherit it from the parent context.
+                return false;
+            }
+        }
+        false
+    }
 }
 
 impl<'tcx> TyCtxtAt<'tcx> {

src/librustdoc/passes/check_doc_test_visibility.rs

@@ -11,7 +11,6 @@ use crate::clean::*;
 use crate::core::DocContext;
 use crate::html::markdown::{find_testable_code, ErrorCodes, Ignore, LangString};
 use crate::visit::DocVisitor;
-use crate::visit_ast::inherits_doc_hidden;
 use rustc_hir as hir;
 use rustc_middle::lint::LintLevelSource;
 use rustc_session::lint;
@@ -95,7 +94,7 @@ pub(crate) fn should_have_doc_example(cx: &DocContext<'_>, item: &clean::Item) -
     }
 
     if cx.tcx.is_doc_hidden(def_id.to_def_id())
-        || inherits_doc_hidden(cx.tcx, def_id)
+        || cx.tcx.inherits_doc_hidden(def_id)
         || cx.tcx.def_span(def_id.to_def_id()).in_derive_expansion()
     {
         return false;

src/librustdoc/passes/strip_hidden.rs

@@ -9,7 +9,6 @@ use crate::clean::{Item, ItemIdSet, NestedAttributesExt};
 use crate::core::DocContext;
 use crate::fold::{strip_item, DocFolder};
 use crate::passes::{ImplStripper, Pass};
-use crate::visit_ast::inherits_doc_hidden;
 
 pub(crate) const STRIP_HIDDEN: Pass = Pass {
     name: "strip-hidden",
@@ -92,7 +91,7 @@ impl<'a, 'tcx> DocFolder for Stripper<'a, 'tcx> {
                     .item_id
                     .as_def_id()
                     .and_then(|def_id| def_id.as_local())
-                    .map(|def_id| inherits_doc_hidden(self.tcx, def_id))
+                    .map(|def_id| self.tcx.inherits_doc_hidden(def_id))
                     .unwrap_or(false);
             }
         }

src/librustdoc/visit_ast.rs

@@ -59,26 +59,6 @@ fn def_id_to_path(tcx: TyCtxt<'_>, did: DefId) -> Vec<Symbol> {
     std::iter::once(crate_name).chain(relative).collect()
 }
 
-pub(crate) fn inherits_doc_hidden(tcx: TyCtxt<'_>, mut def_id: LocalDefId) -> bool {
-    let hir = tcx.hir();
-    while let Some(id) = tcx.opt_local_parent(def_id) {
-        def_id = id;
-        if tcx.is_doc_hidden(def_id.to_def_id()) {
-            return true;
-        } else if let Some(node) = hir.find_by_def_id(def_id) &&
-            matches!(
-                node,
-                hir::Node::Item(hir::Item { kind: hir::ItemKind::Impl(_), .. }),
-            )
-        {
-            // `impl` blocks stand a bit on their own: unless they have `#[doc(hidden)]` directly
-            // on them, they don't inherit it from the parent context.
-            return false;
-        }
-    }
-    false
-}
-
 pub(crate) struct RustdocVisitor<'a, 'tcx> {
     cx: &'a mut core::DocContext<'tcx>,
     view_item_stack: LocalDefIdSet,
@@ -258,7 +238,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
 
         let is_private =
             !self.cx.cache.effective_visibilities.is_directly_public(self.cx.tcx, ori_res_did);
-        let is_hidden = inherits_doc_hidden(self.cx.tcx, res_did);
+        let is_hidden = self.cx.tcx.inherits_doc_hidden(res_did);
 
         // Only inline if requested or if the item would otherwise be stripped.
         if (!please_inline && !is_private && !is_hidden) || is_no_inline {
@@ -279,7 +259,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                 .cache
                 .effective_visibilities
                 .is_directly_public(self.cx.tcx, item_def_id.to_def_id()) &&
-            !inherits_doc_hidden(self.cx.tcx, item_def_id)
+            !self.cx.tcx.inherits_doc_hidden(item_def_id)
         {
             // The imported item is public and not `doc(hidden)` so no need to inline it.
             return false;