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

librustc: De-@mut the trait map

Browse source
This commit is contained in:
Patrick Walton 2013-12-22 14:03:39 -08:00
parent d3fc7b9918
commit a483ee8e33
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/middle/resolve.rs
View file

@ -46,7 +46,7 @@ struct binding_info {
type BindingMap = HashMap<Name,binding_info>;
// Trait method resolution
pub type TraitMap = HashMap<NodeId,@mut ~[DefId]>;
pub type TraitMap = HashMap<NodeId,@RefCell<~[DefId]>>;
// This is the replacement export map. It maps a module to all of the exports
// within.
@ -5244,14 +5244,14 @@ impl Resolver {
// the field name so that we can do some nice error reporting
// later on in typeck.
let traits = self.search_for_traits_containing_method(ident);
self.trait_map.insert(expr.id, @mut traits);
self.trait_map.insert(expr.id, @RefCell::new(traits));
}
ExprMethodCall(_, _, ident, _, _, _) => {
debug!("(recording candidate traits for expr) recording \
traits for {}",
expr.id);
let traits = self.search_for_traits_containing_method(ident);
self.trait_map.insert(expr.id, @mut traits);
self.trait_map.insert(expr.id, @RefCell::new(traits));
}
ExprBinary(_, BiAdd, _, _) | ExprAssignOp(_, BiAdd, _, _) => {
let i = self.lang_items.add_trait();
@ -5442,7 +5442,7 @@ impl Resolver {
trait_id: Option<DefId>) {
match trait_id {
Some(trait_id) => {
self.trait_map.insert(expr_id, @mut ~[trait_id]);
self.trait_map.insert(expr_id, @RefCell::new(~[trait_id]));
}
None => {}
}

3
src/librustc/middle/typeck/check/method.rs
View file

@ -347,7 +347,8 @@ impl<'a> LookupContext<'a> {
let trait_map: &resolve::TraitMap = &self.fcx.ccx.trait_map;
let opt_applicable_traits = trait_map.find(&self.expr.id);
for applicable_traits in opt_applicable_traits.iter() {
for trait_did in applicable_traits.iter() {
let applicable_traits = applicable_traits.borrow();
for trait_did in applicable_traits.get().iter() {
ty::populate_implementations_for_trait_if_necessary(
self.tcx(),
*trait_did);