bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustc: De-@mut the trait_methods_cache

Browse source
This commit is contained in:
Patrick Walton 2013-12-18 15:56:12 -08:00
parent 214d6bc34a
commit 02f13adaa3
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc/metadata/encoder.rs
View file

@ -463,7 +463,8 @@ fn encode_reexported_static_trait_methods(ecx: &EncodeContext,
ebml_w: &mut writer::Encoder, ebml_w: &mut writer::Encoder,
exp: &middle::resolve::Export2) exp: &middle::resolve::Export2)
-> bool { -> bool {
match ecx.tcx.trait_methods_cache.find(&exp.def_id) { let trait_methods_cache = ecx.tcx.trait_methods_cache.borrow();
match trait_methods_cache.get().find(&exp.def_id) {
Some(methods) => { Some(methods) => {
for &m in methods.iter() { for &m in methods.iter() {
if m.explicit_self == ast::sty_static { if m.explicit_self == ast::sty_static {

9
src/librustc/middle/ty.rs
View file

@ -293,7 +293,7 @@ struct ctxt_ {
trait_method_def_ids: RefCell<HashMap<DefId, @~[DefId]>>, trait_method_def_ids: RefCell<HashMap<DefId, @~[DefId]>>,
// A cache for the trait_methods() routine // A cache for the trait_methods() routine
trait_methods_cache: @mut HashMap<DefId, @~[@Method]>, trait_methods_cache: RefCell<HashMap<DefId, @~[@Method]>>,
impl_trait_cache: @mut HashMap<ast::DefId, Option<@ty::TraitRef>>, impl_trait_cache: @mut HashMap<ast::DefId, Option<@ty::TraitRef>>,
@ -1000,7 +1000,7 @@ pub fn mk_ctxt(s: session::Session,
enum_var_cache: @mut HashMap::new(), enum_var_cache: @mut HashMap::new(),
methods: RefCell::new(HashMap::new()), methods: RefCell::new(HashMap::new()),
trait_method_def_ids: RefCell::new(HashMap::new()), trait_method_def_ids: RefCell::new(HashMap::new()),
trait_methods_cache: @mut HashMap::new(), trait_methods_cache: RefCell::new(HashMap::new()),
impl_trait_cache: @mut HashMap::new(), impl_trait_cache: @mut HashMap::new(),
ty_param_defs: @mut HashMap::new(), ty_param_defs: @mut HashMap::new(),
adjustments: @mut HashMap::new(), adjustments: @mut HashMap::new(),
@ -3591,12 +3591,13 @@ pub fn trait_method(cx: ctxt, trait_did: ast::DefId, idx: uint) -> @Method {
pub fn trait_methods(cx: ctxt, trait_did: ast::DefId) -> @~[@Method] { pub fn trait_methods(cx: ctxt, trait_did: ast::DefId) -> @~[@Method] {
match cx.trait_methods_cache.find(&trait_did) { let mut trait_methods_cache = cx.trait_methods_cache.borrow_mut();
match trait_methods_cache.get().find(&trait_did) {
Some(&methods) => methods, Some(&methods) => methods,
None => { None => {
let def_ids = ty::trait_method_def_ids(cx, trait_did); let def_ids = ty::trait_method_def_ids(cx, trait_did);
let methods = @def_ids.map(|d| ty::method(cx, *d)); let methods = @def_ids.map(|d| ty::method(cx, *d));
cx.trait_methods_cache.insert(trait_did, methods); trait_methods_cache.get().insert(trait_did, methods);
methods methods
} }
} }