Ensure doc link maps have one entry per module.

Author: cjgillot

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -1468,6 +1468,10 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                 let table = tcx.associated_types_for_impl_traits_in_associated_fn(def_id);
                 record_defaulted_array!(self.tables.associated_types_for_impl_traits_in_associated_fn[def_id] <- table);
             }
+            if let DefKind::Mod = tcx.def_kind(def_id) {
+                record!(self.tables.doc_link_resolutions[def_id] <- tcx.doc_link_resolutions(def_id));
+                record_array!(self.tables.doc_link_traits_in_scope[def_id] <- tcx.doc_link_traits_in_scope(def_id));
+            }
         }
 
         let inherent_impls = tcx.with_stable_hashing_context(|hcx| {
@@ -1479,14 +1483,6 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                 def_id.index
             }));
         }
-
-        for (def_id, res_map) in &tcx.resolutions(()).doc_link_resolutions {
-            record!(self.tables.doc_link_resolutions[def_id.to_def_id()] <- res_map);
-        }
-
-        for (def_id, traits) in &tcx.resolutions(()).doc_link_traits_in_scope {
-            record_array!(self.tables.doc_link_traits_in_scope[def_id.to_def_id()] <- traits);
-        }
     }
 
     #[instrument(level = "trace", skip(self))]

compiler/rustc_resolve/src/late.rs

@@ -1360,13 +1360,16 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
     }
 
     fn with_scope<T>(&mut self, id: NodeId, f: impl FnOnce(&mut Self) -> T) -> T {
-        if let Some(module) = self.r.get_module(self.r.local_def_id(id).to_def_id()) {
+        let def_id = self.r.local_def_id(id);
+        if let Some(module) = self.r.get_module(def_id.to_def_id()) {
             // Move down in the graph.
             let orig_module = replace(&mut self.parent_scope.module, module);
             self.with_rib(ValueNS, RibKind::Module(module), |this| {
                 this.with_rib(TypeNS, RibKind::Module(module), |this| {
                     let ret = f(this);
                     this.parent_scope.module = orig_module;
+                    this.r.doc_link_resolutions.entry(def_id).or_default();
+                    this.r.doc_link_traits_in_scope.entry(def_id).or_default();
                     ret
                 })
             })
@@ -4561,5 +4564,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
         for (id, span) in late_resolution_visitor.diagnostic_metadata.unused_labels.iter() {
             self.lint_buffer.buffer_lint(lint::builtin::UNUSED_LABELS, *id, *span, "unused label");
         }
+        self.doc_link_resolutions.entry(CRATE_DEF_ID).or_default();
+        self.doc_link_traits_in_scope.entry(CRATE_DEF_ID).or_default();
     }
 }