---

yaml
---
r: 147694
b: refs/heads/try2
c: a483ee8
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d3fc7b9918c7225351985b84463c85879964acb0
+refs/heads/try2: a483ee8e33c74ffe2b06e62b934c91ec0aa762ba
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/resolve.rs

@@ -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 => {}
         }

branches/try2/src/librustc/middle/typeck/check/method.rs

@@ -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);