user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace Arc with Rc around external_traits

Browse source
This commit is contained in:
Mark Rousskov 2019-08-10 16:19:25 -04:00
parent c57481001e
commit 6be2857a6c
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/clean/mod.rs
View file

@ -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>,
}

3
src/librustdoc/core.rs
View file

@ -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>>,