Remove "primitive_locations" field from Cache

Author: GuillaumeGomez

src/librustdoc/formats/cache.rs

@@ -9,7 +9,7 @@ use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc_middle::middle::privacy::AccessLevels;
 use rustc_span::source_map::FileName;
 
-use crate::clean::{self, GetDefId};
+use crate::clean::{self, primitives, GetDefId};
 use crate::config::RenderInfo;
 use crate::fold::DocFolder;
 use crate::formats::item_type::ItemType;
@@ -76,9 +76,6 @@ pub struct Cache {
     /// Cache of where external crate documentation can be found.
     pub extern_locations: FxHashMap<CrateNum, (String, PathBuf, ExternalLocation)>,
 
-    /// Cache of where documentation for primitives can be found.
-    pub primitive_locations: FxHashMap<clean::PrimitiveType, DefId>,
-
     // Note that external items for which `doc(hidden)` applies to are shown as
     // non-reachable while local items aren't. This is because we're reusing
     // the access levels from the privacy check pass.
@@ -182,19 +179,6 @@ impl Cache {
             cache.external_paths.insert(did, (vec![e.name.to_string()], ItemType::Module));
         }
 
-        // Cache where all known primitives have their documentation located.
-        //
-        // Favor linking to as local extern as possible, so iterate all crates in
-        // reverse topological order.
-        for &(_, ref e) in krate.externs.iter().rev() {
-            for &(def_id, prim, _) in &e.primitives {
-                cache.primitive_locations.insert(prim, def_id);
-            }
-        }
-        for &(def_id, prim, _) in &krate.primitives {
-            cache.primitive_locations.insert(prim, def_id);
-        }
-
         cache.stack.push(krate.name.clone());
         krate = cache.fold_crate(krate);
 
@@ -403,9 +387,8 @@ impl DocFolder for Cache {
                         true
                     }
                     ref t => {
-                        let prim_did = t
-                            .primitive_type()
-                            .and_then(|t| self.primitive_locations.get(&t).cloned());
+                        let prim_did =
+                            t.primitive_type().and_then(|t| primitives().get(&t).cloned());
                         match prim_did {
                             Some(did) => {
                                 self.parent_stack.push(did);
@@ -436,9 +419,8 @@ impl DocFolder for Cache {
                             dids.insert(did);
                         }
                         ref t => {
-                            let did = t
-                                .primitive_type()
-                                .and_then(|t| self.primitive_locations.get(&t).cloned());
+                            let did =
+                                t.primitive_type().and_then(|t| primitives().get(&t).cloned());
 
                             if let Some(did) = did {
                                 dids.insert(did);

src/librustdoc/html/format.rs

@@ -14,7 +14,7 @@ use rustc_hir as hir;
 use rustc_span::def_id::DefId;
 use rustc_target::spec::abi::Abi;
 
-use crate::clean::{self, PrimitiveType};
+use crate::clean::{self, primitives, PrimitiveType};
 use crate::formats::cache::cache;
 use crate::formats::item_type::ItemType;
 use crate::html::escape::Escape;
@@ -559,10 +559,13 @@ fn primitive_link(
     prim: clean::PrimitiveType,
     name: &str,
 ) -> fmt::Result {
-    let m = cache();
     let mut needs_termination = false;
+
     if !f.alternate() {
-        match m.primitive_locations.get(&prim) {
+        let m = cache();
+        let primitives = primitives();
+
+        match primitives.get(&prim) {
             Some(&def_id) if def_id.is_local() => {
                 let len = CURRENT_DEPTH.with(|s| s.get());
                 let len = if len == 0 { 0 } else { len - 1 };

src/librustdoc/html/render/mod.rs

@@ -63,7 +63,7 @@ use rustc_span::symbol::{sym, Symbol};
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 
-use crate::clean::{self, AttributesExt, Deprecation, GetDefId, SelfTy, TypeKind};
+use crate::clean::{self, primitives, AttributesExt, Deprecation, GetDefId, SelfTy, TypeKind};
 use crate::config::RenderInfo;
 use crate::config::RenderOptions;
 use crate::docfs::{DocFS, PathError};
@@ -3405,7 +3405,7 @@ fn render_deref_methods(
         render_assoc_items(w, cx, container_item, did, what, cache);
     } else {
         if let Some(prim) = target.primitive_type() {
-            if let Some(&did) = cache.primitive_locations.get(&prim) {
+            if let Some(&did) = primitives().get(&prim) {
                 render_assoc_items(w, cx, container_item, did, what, cache);
             }
         }
@@ -4058,7 +4058,7 @@ fn sidebar_assoc_items(it: &clean::Item) -> String {
                         .def_id()
                         .or(target
                             .primitive_type()
-                            .and_then(|prim| c.primitive_locations.get(&prim).cloned()))
+                            .and_then(|prim| primitives().get(&prim).cloned()))
                         .and_then(|did| c.impls.get(&did));
                     if let Some(impls) = inner_impl {
                         out.push_str("<a class=\"sidebar-title\" href=\"#deref-methods\">");