---

yaml
---
r: 147555
b: refs/heads/try2
c: a66fcca
h: refs/heads/master
i:
  147553: 2616441
  147551: 10f90f9
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: daf31d2b4f35b5d125e2e354e9e9f74fe4ff52ff
+refs/heads/try2: a66fcca9c9c279db5ab804734a0310b6aec60415
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -330,7 +330,7 @@ struct ctxt_ {
     destructor_for_type: RefCell<HashMap<ast::DefId, ast::DefId>>,
 
     // A method will be in this list if and only if it is a destructor.
-    destructors: @mut HashSet<ast::DefId>,
+    destructors: RefCell<HashSet<ast::DefId>>,
 
     // Maps a trait onto a list of impls of that trait.
     trait_impls: @mut HashMap<ast::DefId, @mut ~[@Impl]>,
@@ -1004,7 +1004,7 @@ pub fn mk_ctxt(s: session::Session,
         provided_method_sources: RefCell::new(HashMap::new()),
         supertraits: RefCell::new(HashMap::new()),
         destructor_for_type: RefCell::new(HashMap::new()),
-        destructors: @mut HashSet::new(),
+        destructors: RefCell::new(HashSet::new()),
         trait_impls: @mut HashMap::new(),
         inherent_impls:  @mut HashMap::new(),
         impls:  @mut HashMap::new(),

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

@@ -1151,7 +1151,8 @@ impl<'a> LookupContext<'a> {
         let bad;
         match candidate.origin {
             method_static(method_id) => {
-                bad = self.tcx().destructors.contains(&method_id);
+                let destructors = self.tcx().destructors.borrow();
+                bad = destructors.get().contains(&method_id);
             }
             // XXX: does this properly enforce this on everything now
             // that self has been merged in? -sully

branches/try2/src/librustc/middle/typeck/coherence.rs

@@ -709,7 +709,8 @@ impl CoherenceChecker {
                                                      .borrow_mut();
                     destructor_for_type.get().insert(type_def_id,
                                                      method_def_id);
-                    tcx.destructors.insert(method_def_id);
+                    let mut destructors = tcx.destructors.borrow_mut();
+                    destructors.get().insert(method_def_id);
                 }
                 _ => {
                     // Destructors only work on nominal types.