about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2021-02-23 15:19:13 +0100
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2021-03-04 21:22:43 +0100
commitad30c39918ca4191cb4b0191cfb56b97d9bef330 (patch)
treecb451b34d352e08132e14dfcedf514c0e54aacf8
parent186f13914a825039081795d382eb75c6a9f981ae (diff)
downloadrust-ad30c39918ca4191cb4b0191cfb56b97d9bef330.tar.gz
rust-ad30c39918ca4191cb4b0191cfb56b97d9bef330.zip
Pass TyCtxt directly instead of DocContext in librustdoc::visit_ast::inherits_doc_hidden
-rw-r--r--src/librustdoc/passes/doc_test_lints.rs2
-rw-r--r--src/librustdoc/visit_ast.rs8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustdoc/passes/doc_test_lints.rs b/src/librustdoc/passes/doc_test_lints.rs
index cf8966fadf6..2ce43dd9ff8 100644
--- a/src/librustdoc/passes/doc_test_lints.rs
+++ b/src/librustdoc/passes/doc_test_lints.rs
@@ -73,7 +73,7 @@ crate fn should_have_doc_example(cx: &DocContext<'_>, item: &clean::Item) -> boo
     }
     let hir_id = cx.tcx.hir().local_def_id_to_hir_id(item.def_id.expect_local());
     if cx.tcx.hir().attrs(hir_id).lists(sym::doc).has_word(sym::hidden)
-        || inherits_doc_hidden(cx, hir_id)
+        || inherits_doc_hidden(cx.tcx, hir_id)
     {
         return false;
     }
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index 875be028e84..ba6bb359b91 100644
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -29,10 +29,10 @@ fn def_id_to_path(tcx: TyCtxt<'_>, did: DefId) -> Vec<String> {
     std::iter::once(crate_name).chain(relative).collect()
 }
 
-crate fn inherits_doc_hidden(cx: &core::DocContext<'_>, mut node: hir::HirId) -> bool {
-    while let Some(id) = cx.tcx.hir().get_enclosing_scope(node) {
+crate fn inherits_doc_hidden(tcx: TyCtxt<'_>, mut node: hir::HirId) -> bool {
+    while let Some(id) = tcx.hir().get_enclosing_scope(node) {
         node = id;
-        if cx.tcx.hir().attrs(node).lists(sym::doc).has_word(sym::hidden) {
+        if tcx.hir().attrs(node).lists(sym::doc).has_word(sym::hidden) {
             return true;
         }
     }
@@ -209,7 +209,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
         };
 
         let is_private = !self.cx.cache.access_levels.is_public(res_did);
-        let is_hidden = inherits_doc_hidden(self.cx, res_hir_id);
+        let is_hidden = inherits_doc_hidden(self.cx.tcx, res_hir_id);
 
         // Only inline if requested or if the item would otherwise be stripped.
         if (!please_inline && !is_private && !is_hidden) || is_no_inline {