---

yaml
---
r: 94713
b: refs/heads/try
c: 620be92
h: refs/heads/master
i:
  94711: a84d035
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 5a9c37b7f53cf6dfb1f540c87e3a1d04f5d704ba
+refs/heads/try: 620be9235dbbb2f57462761bcfe0bebb8e2bbece
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/metadata/creader.rs

@@ -15,6 +15,7 @@ use metadata::cstore;
 use metadata::decoder;
 use metadata::loader;
 
+use std::cell::RefCell;
 use std::hashmap::HashMap;
 use syntax::ast;
 use syntax::abi;
@@ -347,5 +348,5 @@ fn resolve_crate_deps(e: &mut Env, cdata: &[u8]) -> cstore::cnum_map {
           }
         }
     }
-    return @mut cnum_map;
+    return @RefCell::new(cnum_map);
 }

branches/try/src/librustc/metadata/cstore.rs

@@ -24,7 +24,7 @@ use syntax::parse::token::ident_interner;
 // local crate numbers (as generated during this session). Each external
 // crate may refer to types in other external crates, and each has their
 // own crate numbers.
-pub type cnum_map = @mut HashMap<ast::CrateNum, ast::CrateNum>;
+pub type cnum_map = @RefCell<HashMap<ast::CrateNum, ast::CrateNum>>;
 
 pub enum MetadataBlob {
     MetadataVec(~[u8]),

branches/try/src/librustc/metadata/decoder.rs

@@ -1197,9 +1197,15 @@ pub fn translate_def_id(cdata: Cmd, did: ast::DefId) -> ast::DefId {
         return ast::DefId { crate: cdata.cnum, node: did.node };
     }
 
-    match cdata.cnum_map.find(&did.crate) {
-      option::Some(&n) => ast::DefId { crate: n, node: did.node },
-      option::None => fail!("didn't find a crate in the cnum_map")
+    let cnum_map = cdata.cnum_map.borrow();
+    match cnum_map.get().find(&did.crate) {
+        Some(&n) => {
+            ast::DefId {
+                crate: n,
+                node: did.node,
+            }
+        }
+        None => fail!("didn't find a crate in the cnum_map")
     }
 }
 

branches/try/src/librustc/middle/borrowck/mod.rs

@@ -83,7 +83,7 @@ pub fn check_crate(
         capture_map: capture_map,
         root_map: root_map(),
         write_guard_map: @RefCell::new(HashSet::new()),
-        stats: @mut BorrowStats {
+        stats: @BorrowStats {
             loaned_paths_same: Cell::new(0),
             loaned_paths_imm: Cell::new(0),
             stable_paths: Cell::new(0),
@@ -172,7 +172,7 @@ pub struct BorrowckCtxt {
     write_guard_map: write_guard_map,
 
     // Statistics:
-    stats: @mut BorrowStats
+    stats: @BorrowStats
 }
 
 pub struct BorrowStats {