---

yaml
---
r: 97049
b: refs/heads/dist-snap
c: 3528f74
h: refs/heads/master
i:
  97047: c420ada
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: 978b6bf5a1b4b74e9c89e6db753823f9a7cb7f57
+refs/heads/dist-snap: 3528f74335be6f28671277936d643efb16cbc6c7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/metadata/cstore.rs

@@ -63,7 +63,7 @@ pub struct CrateSource {
 pub struct CStore {
     priv metas: RefCell<HashMap<ast::CrateNum, @crate_metadata>>,
     priv extern_mod_crate_map: RefCell<extern_mod_crate_map>,
-    priv used_crate_sources: ~[CrateSource],
+    priv used_crate_sources: RefCell<~[CrateSource]>,
     priv used_libraries: ~[(~str, NativeLibaryKind)],
     priv used_link_args: ~[~str],
     intr: @ident_interner
@@ -77,7 +77,7 @@ impl CStore {
         CStore {
             metas: RefCell::new(HashMap::new()),
             extern_mod_crate_map: RefCell::new(HashMap::new()),
-            used_crate_sources: ~[],
+            used_crate_sources: RefCell::new(~[]),
             used_libraries: ~[],
             used_link_args: ~[],
             intr: intr
@@ -117,18 +117,17 @@ impl CStore {
     }
 
     pub fn add_used_crate_source(&mut self, src: CrateSource) {
-        if !self.used_crate_sources.contains(&src) {
-            self.used_crate_sources.push(src);
+        let mut used_crate_sources = self.used_crate_sources.borrow_mut();
+        if !used_crate_sources.get().contains(&src) {
+            used_crate_sources.get().push(src);
         }
     }
 
-    pub fn get_used_crate_sources<'a>(&'a self) -> &'a [CrateSource] {
-        self.used_crate_sources.as_slice()
-    }
-
     pub fn get_used_crates(&self, prefer: LinkagePreference)
                            -> ~[(ast::CrateNum, Option<Path>)] {
-        self.used_crate_sources.iter()
+        let used_crate_sources = self.used_crate_sources.borrow();
+        used_crate_sources.get()
+            .iter()
             .map(|src| (src.cnum, match prefer {
                 RequireDynamic => src.dylib.clone(),
                 RequireStatic => src.rlib.clone(),