---

yaml
---
r: 97006
b: refs/heads/dist-snap
c: 5b98c66
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 7f5e57a5a93a868b5bd9485b9c9d45e997a78e41
+refs/heads/dist-snap: 5b98c66593660cfa4ee4d39aabeaa97bb36eb75f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/ty.rs

@@ -321,7 +321,7 @@ struct ctxt_ {
 
     // Maps from def-id of a type or region parameter to its
     // (inferred) variance.
-    item_variance_map: @mut HashMap<ast::DefId, @ItemVariances>,
+    item_variance_map: RefCell<HashMap<ast::DefId, @ItemVariances>>,
 
     // A mapping from the def ID of an enum or struct type to the def ID
     // of the method that implements its destructor. If the type is not
@@ -975,7 +975,7 @@ pub fn mk_ctxt(s: session::Session,
             -> ctxt {
     @ctxt_ {
         named_region_map: named_region_map,
-        item_variance_map: @mut HashMap::new(),
+        item_variance_map: RefCell::new(HashMap::new()),
         diag: s.diagnostic(),
         interner: RefCell::new(HashMap::new()),
         next_id: @mut primitives::LAST_PRIMITIVE_ID,
@@ -4483,8 +4483,9 @@ pub fn visitor_object_ty(tcx: ctxt,
 }
 
 pub fn item_variances(tcx: ctxt, item_id: ast::DefId) -> @ItemVariances {
+    let mut item_variance_map = tcx.item_variance_map.borrow_mut();
     lookup_locally_or_in_crate_store(
-        "item_variance_map", item_id, tcx.item_variance_map,
+        "item_variance_map", item_id, item_variance_map.get(),
         || @csearch::get_item_variances(tcx.cstore, item_id))
 }
 

branches/dist-snap/src/librustc/middle/typeck/variance.rs

@@ -363,7 +363,10 @@ impl<'a> Visitor<()> for TermsContext<'a> {
                 // "invalid item id" from "item id with no
                 // parameters".
                 if self.num_inferred() == inferreds_on_entry {
-                    let newly_added = self.tcx.item_variance_map.insert(
+                    let mut item_variance_map = self.tcx
+                                                    .item_variance_map
+                                                    .borrow_mut();
+                    let newly_added = item_variance_map.get().insert(
                         ast_util::local_def(item.id),
                         self.empty_variances);
                     assert!(newly_added);
@@ -876,7 +879,6 @@ impl<'a> SolveContext<'a> {
         // item id).
 
         let tcx = self.terms_cx.tcx;
-        let item_variance_map = tcx.item_variance_map;
         let solutions = &self.solutions;
         let inferred_infos = &self.terms_cx.inferred_infos;
         let mut index = 0;
@@ -919,8 +921,9 @@ impl<'a> SolveContext<'a> {
                 tcx.sess.span_err(ast_map::node_span(tcx.items, item_id), found);
             }
 
-            let newly_added = item_variance_map.insert(item_def_id,
-                                                       @item_variances);
+            let mut item_variance_map = tcx.item_variance_map.borrow_mut();
+            let newly_added = item_variance_map.get().insert(item_def_id,
+                                                             @item_variances);
             assert!(newly_added);
         }
     }