diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-08-10 16:19:25 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-08-11 10:36:46 -0400 |
| commit | 6be2857a6cc551f63cd79d9d59322fbb2ce9103d (patch) | |
| tree | 1b51c9289b6c179ce1d29d0e86ce157b3cd55fcb | |
| parent | c57481001ea81665b1ca23368b710a0435d28653 (diff) | |
| download | rust-6be2857a6cc551f63cd79d9d59322fbb2ce9103d.tar.gz rust-6be2857a6cc551f63cd79d9d59322fbb2ce9103d.zip | |
Replace Arc with Rc around external_traits
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/core.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index ee76bf35cab..af4fe62bcbc 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -131,7 +131,7 @@ pub struct Crate { pub primitives: Vec<(DefId, PrimitiveType, Attributes)>, // These are later on moved into `CACHEKEY`, leaving the map empty. // Only here so that they can be filtered through the rustdoc passes. - pub external_traits: Arc<RefCell<FxHashMap<DefId, Trait>>>, + pub external_traits: Rc<RefCell<FxHashMap<DefId, Trait>>>, pub masked_crates: FxHashSet<CrateNum>, } diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 6b524e1206f..a14ddc706d5 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -26,7 +26,6 @@ use errors::emitter::{Emitter, EmitterWriter}; use std::cell::RefCell; use std::mem; use rustc_data_structures::sync::{self, Lrc}; -use std::sync::Arc; use std::rc::Rc; use crate::config::{Options as RustdocOptions, RenderOptions}; @@ -49,7 +48,7 @@ pub struct DocContext<'tcx> { /// Later on moved into `html::render::CACHE_KEY` pub renderinfo: RefCell<RenderInfo>, /// Later on moved through `clean::Crate` into `html::render::CACHE_KEY` - pub external_traits: Arc<RefCell<FxHashMap<DefId, clean::Trait>>>, + pub external_traits: Rc<RefCell<FxHashMap<DefId, clean::Trait>>>, /// Used while populating `external_traits` to ensure we don't process the same trait twice at /// the same time. pub active_extern_traits: RefCell<Vec<DefId>>, |
