Fix dangling ID when pub useing item which is Doc(hidden) or inherits it in rustdoc JSON output

Author: GuillaumeGomez

src/librustdoc/clean/types.rs

@@ -38,7 +38,7 @@ use rustc_target::spec::abi::Abi;
 use crate::clean::cfg::Cfg;
 use crate::clean::external_path;
 use crate::clean::inline::{self, print_inlined_const};
-use crate::clean::utils::{is_literal_expr, print_evaluated_const};
+use crate::clean::utils::{inherits_doc_hidden, is_literal_expr, print_evaluated_const};
 use crate::core::DocContext;
 use crate::formats::cache::Cache;
 use crate::formats::item_type::ItemType;
@@ -2445,6 +2445,15 @@ impl Import {
     pub(crate) fn imported_item_is_doc_hidden(&self, tcx: TyCtxt<'_>) -> bool {
         self.source.did.map_or(false, |did| tcx.is_doc_hidden(did))
     }
+
+    pub(crate) fn inherits_doc_hidden(&self, tcx: TyCtxt<'_>) -> bool {
+        self.imported_item_is_doc_hidden(tcx)
+            || self
+                .source
+                .did
+                .and_then(|did| did.as_local())
+                .map_or(false, |did| inherits_doc_hidden(tcx, did, None))
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -2455,6 +2464,12 @@ pub(crate) enum ImportKind {
     Glob,
 }
 
+impl ImportKind {
+    pub fn is_glob(&self) -> bool {
+        matches!(self, Self::Glob)
+    }
+}
+
 #[derive(Clone, Debug)]
 pub(crate) struct ImportSource {
     pub(crate) path: Path,

src/librustdoc/json/conversions.rs

@@ -17,7 +17,7 @@ use rustc_target::spec::abi::Abi as RustcAbi;
 
 use rustdoc_json_types::*;
 
-use crate::clean::{self, ItemId};
+use crate::clean::{self, ImportKind, ItemId};
 use crate::formats::item_type::ItemType;
 use crate::formats::FormatRenderer;
 use crate::json::JsonRenderer;
@@ -760,20 +760,24 @@ impl FromWithTcx<clean::Discriminant> for Discriminant {
 
 impl FromWithTcx<clean::Import> for Import {
     fn from_tcx(import: clean::Import, tcx: TyCtxt<'_>) -> Self {
-        use clean::ImportKind::*;
-        let (name, glob) = match import.kind {
-            Simple(s) => (s.to_string(), false),
-            Glob => (
+        let (name, glob, id) = match import.kind {
+            ImportKind::Simple(s) => {
+                let is_from_doc_hidden =
+                    import.imported_item_is_doc_hidden(tcx) || import.inherits_doc_hidden(tcx);
+                let id = if is_from_doc_hidden {
+                    None
+                } else {
+                    import.source.did.map(ItemId::from).map(|i| id_from_item_default(i, tcx))
+                };
+                (s.to_string(), false, id)
+            }
+            ImportKind::Glob => (
                 import.source.path.last_opt().unwrap_or_else(|| Symbol::intern("*")).to_string(),
                 true,
+                import.source.did.map(ItemId::from).map(|i| id_from_item_default(i, tcx)),
             ),
         };
-        Import {
-            source: import.source.path.whole_name(),
-            name,
-            id: import.source.did.map(ItemId::from).map(|i| id_from_item_default(i, tcx)),
-            glob,
-        }
+        Import { source: import.source.path.whole_name(), name, id, glob }
     }
 }
 

src/librustdoc/passes/stripper.rs

@@ -244,7 +244,7 @@ pub(crate) struct ImportStripper<'tcx> {
 
 impl<'tcx> ImportStripper<'tcx> {
     fn import_should_be_hidden(&self, i: &Item, imp: &clean::Import) -> bool {
-        if self.is_json_output {
+        if self.is_json_output && imp.kind.is_glob() {
             // FIXME: This should be handled the same way as for HTML output.
             imp.imported_item_is_doc_hidden(self.tcx)
         } else {