diff options
| -rw-r--r-- | src/librustdoc/clean/types.rs | 1 | ||||
| -rw-r--r-- | src/librustdoc/clean/utils.rs | 5 | ||||
| -rw-r--r-- | src/librustdoc/formats/cache.rs | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index 2636467196a..114b68c56b8 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -57,7 +57,6 @@ crate struct Crate { // These are later on moved into `CACHEKEY`, leaving the map empty. // Only here so that they can be filtered through the rustdoc passes. crate external_traits: Rc<RefCell<FxHashMap<DefId, TraitWithExtraInfo>>>, - crate masked_crates: FxHashSet<CrateNum>, crate collapsed: bool, } diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs index a64e8c21c46..8b5f5b66c45 100644 --- a/src/librustdoc/clean/utils.rs +++ b/src/librustdoc/clean/utils.rs @@ -7,7 +7,6 @@ use crate::clean::{ }; use crate::core::DocContext; -use rustc_data_structures::fx::FxHashSet; use rustc_hir as hir; use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::{DefId, LOCAL_CRATE}; @@ -38,7 +37,6 @@ crate fn krate(cx: &mut DocContext<'_>) -> Crate { // Clean the crate, translating the entire librustc_ast AST to one that is // understood by rustdoc. let mut module = module.clean(cx); - let mut masked_crates = FxHashSet::default(); match *module.kind { ItemKind::ModuleItem(ref module) => { @@ -49,7 +47,7 @@ crate fn krate(cx: &mut DocContext<'_>) -> Crate { && (it.attrs.has_doc_flag(sym::masked) || cx.tcx.is_compiler_builtins(it.def_id.krate)) { - masked_crates.insert(it.def_id.krate); + cx.cache.masked_crates.insert(it.def_id.krate); } } } @@ -82,7 +80,6 @@ crate fn krate(cx: &mut DocContext<'_>) -> Crate { externs, primitives, external_traits: cx.external_traits.clone(), - masked_crates, collapsed: false, } } diff --git a/src/librustdoc/formats/cache.rs b/src/librustdoc/formats/cache.rs index f20296f4fe1..9415caf8b6f 100644 --- a/src/librustdoc/formats/cache.rs +++ b/src/librustdoc/formats/cache.rs @@ -89,12 +89,16 @@ crate struct Cache { /// This is stored in `Cache` so it doesn't need to be passed through all rustdoc functions. crate document_private: bool, + /// Crates marked with [`#[doc(masked)]`][doc_masked]. + /// + /// [doc_masked]: https://doc.rust-lang.org/nightly/unstable-book/language-features/doc-masked.html + crate masked_crates: FxHashSet<CrateNum>, + // Private fields only used when initially crawling a crate to build a cache stack: Vec<String>, parent_stack: Vec<DefId>, parent_is_trait_impl: bool, stripped_mod: bool, - masked_crates: FxHashSet<CrateNum>, crate search_index: Vec<IndexItem>, crate deref_trait_did: Option<DefId>, @@ -146,7 +150,6 @@ impl Cache { // Crawl the crate to build various caches used for the output debug!(?self.crate_version); self.traits = krate.external_traits.take(); - self.masked_crates = mem::take(&mut krate.masked_crates); // Cache where all our extern crates are located // FIXME: this part is specific to HTML so it'd be nice to remove it from the common code |