cache primitives before running clean over all crates items

Author: GuillaumeGomez

src/librustdoc/clean/mod.rs

@@ -28,10 +28,12 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::{self, Pos};
 use rustc_typeck::hir_ty_to_ty;
 
+use std::cell::RefCell;
 use std::collections::hash_map::Entry;
 use std::default::Default;
 use std::hash::Hash;
 use std::rc::Rc;
+use std::sync::Arc;
 use std::{mem, vec};
 
 use crate::core::{self, DocContext, ImplTraitParam};
@@ -48,6 +50,13 @@ pub use self::types::Type::*;
 pub use self::types::Visibility::{Inherited, Public};
 pub use self::types::*;
 
+thread_local!(static PRIMITIVES: RefCell<Arc<FxHashMap<PrimitiveType, DefId>>> =
+    Default::default());
+
+crate fn primitives() -> Arc<FxHashMap<PrimitiveType, DefId>> {
+    PRIMITIVES.with(|c| c.borrow().clone())
+}
+
 const FN_OUTPUT_NAME: &str = "Output";
 
 pub trait Clean<T> {
@@ -126,7 +135,7 @@ impl Clean<ExternalCrate> for CrateNum {
             }
             None
         };
-        let primitives = if root.is_local() {
+        let primitives: Vec<(DefId, PrimitiveType, Attributes)> = if root.is_local() {
             cx.tcx
                 .hir()
                 .krate()
@@ -161,6 +170,13 @@ impl Clean<ExternalCrate> for CrateNum {
                 .filter_map(as_primitive)
                 .collect()
         };
+        PRIMITIVES.with(|v| {
+            let mut tmp = v.borrow_mut();
+            let stored_primitives = Arc::make_mut(&mut *tmp);
+            for (prim, did) in primitives.iter().map(|x| (x.1, x.0)) {
+                stored_primitives.insert(prim, did);
+            }
+        });
 
         let as_keyword = |res: Res| {
             if let Res::Def(DefKind::Mod, def_id) = res {

src/librustdoc/clean/types.rs

@@ -1173,7 +1173,7 @@ impl GetDefId for Type {
     fn def_id(&self) -> Option<DefId> {
         match *self {
             ResolvedPath { did, .. } => Some(did),
-            Primitive(p) => cache().primitive_locations.get(&p).cloned(),
+            Primitive(p) => super::primitives().get(&p).cloned(),
             BorrowedRef { type_: box Generic(..), .. } => {
                 Primitive(PrimitiveType::Reference).def_id()
             }