---

yaml
---
r: 147710
b: refs/heads/try2
c: ed819c9
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: 1f76a9ba5ef3b9b1f903ef3fd0f932972566720c
+refs/heads/try2: ed819c9a81d138ab876c42ad35025ff432845a2c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -37,7 +37,7 @@ pub fn read_crates(sess: Session,
     let mut e = Env {
         sess: sess,
         os: os,
-        crate_cache: @mut ~[],
+        crate_cache: @RefCell::new(~[]),
         next_crate_num: 1,
         intr: intr
     };
@@ -48,8 +48,9 @@ pub fn read_crates(sess: Session,
         };
         visit::walk_crate(&mut v, crate, ());
     }
-    dump_crates(*e.crate_cache);
-    warn_if_multiple_versions(&mut e, sess.diagnostic(), *e.crate_cache);
+    let crate_cache = e.crate_cache.borrow();
+    dump_crates(*crate_cache.get());
+    warn_if_multiple_versions(&mut e, sess.diagnostic(), *crate_cache.get());
 }
 
 struct ReadCrateVisitor<'a> {
@@ -111,7 +112,7 @@ fn warn_if_multiple_versions(e: &mut Env,
 struct Env {
     sess: Session,
     os: loader::Os,
-    crate_cache: @mut ~[cache_entry],
+    crate_cache: @RefCell<~[cache_entry]>,
     next_crate_num: ast::CrateNum,
     intr: @ident_interner
 }
@@ -242,7 +243,8 @@ fn visit_item(e: &Env, i: @ast::item) {
 }
 
 fn existing_match(e: &Env, name: @str, version: @str, hash: &str) -> Option<ast::CrateNum> {
-    for c in e.crate_cache.iter() {
+    let crate_cache = e.crate_cache.borrow();
+    for c in crate_cache.get().iter() {
         let pkgid_version = match c.pkgid.version {
             None => @"0.0",
             Some(ref ver) => ver.to_managed(),
@@ -285,12 +287,15 @@ fn resolve_crate(e: &mut Env,
 
         // Claim this crate number and cache it
         let cnum = e.next_crate_num;
-        e.crate_cache.push(cache_entry {
-            cnum: cnum,
-            span: span,
-            hash: hash,
-            pkgid: pkgid,
-        });
+        {
+            let mut crate_cache = e.crate_cache.borrow_mut();
+            crate_cache.get().push(cache_entry {
+                cnum: cnum,
+                span: span,
+                hash: hash,
+                pkgid: pkgid,
+            });
+        }
         e.next_crate_num += 1;
 
         // Now resolve the crates referenced by this crate