---

yaml
---
r: 97397
b: refs/heads/dist-snap
c: 39f39ed
h: refs/heads/master
i:
  97395: 7089f83
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: 27cc3d203baf219ae06596e9ac44f0c394024bb5
+refs/heads/dist-snap: 39f39ed40bc7c8a2c01a61584fb88a723b3e62ca
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libsyntax/codemap.rs

@@ -223,7 +223,7 @@ pub struct FileMap {
     /// Locations of lines beginnings in the source code
     lines: RefCell<~[BytePos]>,
     /// Locations of multi-byte characters in the source code
-    multibyte_chars: @mut ~[MultiByteChar],
+    multibyte_chars: RefCell<~[MultiByteChar]>,
 }
 
 impl FileMap {
@@ -258,7 +258,8 @@ impl FileMap {
             pos: pos,
             bytes: bytes,
         };
-        self.multibyte_chars.push(mbc);
+        let mut multibyte_chars = self.multibyte_chars.borrow_mut();
+        multibyte_chars.get().push(mbc);
     }
 
     pub fn is_real_file(&self) -> bool {
@@ -300,7 +301,7 @@ impl CodeMap {
             name: filename, substr: substr, src: src,
             start_pos: Pos::from_uint(start_pos),
             lines: RefCell::new(~[]),
-            multibyte_chars: @mut ~[],
+            multibyte_chars: RefCell::new(~[]),
         };
 
         files.push(filemap);
@@ -471,7 +472,8 @@ impl CodeMap {
         // The number of extra bytes due to multibyte chars in the FileMap
         let mut total_extra_bytes = 0;
 
-        for mbc in map.multibyte_chars.iter() {
+        let multibyte_chars = map.multibyte_chars.borrow();
+        for mbc in multibyte_chars.get().iter() {
             debug!("codemap: {:?}-byte char at {:?}", mbc.bytes, mbc.pos);
             if mbc.pos < bpos {
                 total_extra_bytes += mbc.bytes;

branches/dist-snap/src/libsyntax/ext/source_util.rs

@@ -115,7 +115,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::token_tree])
                 src: s,
                 start_pos: codemap::BytePos(0),
                 lines: RefCell::new(~[]),
-                multibyte_chars: @mut ~[],
+                multibyte_chars: RefCell::new(~[]),
             });
             base::MRExpr(cx.expr_str(sp, s))
         }