---

yaml
---
r: 42973
b: refs/heads/try
c: 6e0f05b
h: refs/heads/master
i:
  42971: 8e77cc3
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 2e77526b9472e3e5840703cfd05dcd911b9e2956
+refs/heads/try: 6e0f05b059e84c621097b31b22609d220b6a16e8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/io.rs

@@ -490,25 +490,25 @@ pub fn FILERes(f: *libc::FILE) -> FILERes {
     }
 }
 
-pub fn FILE_reader(f: *libc::FILE, cleanup: bool) -> Reader {
+pub fn FILE_reader(f: *libc::FILE, cleanup: bool) -> @Reader {
     if cleanup {
-        Wrapper { base: f, cleanup: FILERes(f) } as Reader
+        @Wrapper { base: f, cleanup: FILERes(f) } as @Reader
     } else {
-        f as Reader
+        @f as @Reader
     }
 }
 
 // FIXME (#2004): this should either be an trait-less impl, a set of
 // top-level functions that take a reader, or a set of default methods on
 // reader (which can then be called reader)
 
-pub fn stdin() -> Reader {
+pub fn stdin() -> @Reader {
     unsafe {
-        rustrt::rust_get_stdin() as Reader
+        rustrt::rust_get_stdin() as @Reader
     }
 }
 
-pub fn file_reader(path: &Path) -> Result<Reader, ~str> {
+pub fn file_reader(path: &Path) -> Result<@Reader, ~str> {
     unsafe {
         let f = os::as_c_charp(path.to_str(), |pathbuf| {
             os::as_c_charp("r", |modebuf|
@@ -555,11 +555,11 @@ impl BytesReader: Reader {
     fn tell(&self) -> uint { self.pos }
 }
 
-pub pure fn with_bytes_reader<t>(bytes: &[u8], f: fn(Reader) -> t) -> t {
-    f(BytesReader { bytes: bytes, pos: 0u } as Reader)
+pub pure fn with_bytes_reader<t>(bytes: &[u8], f: fn(@Reader) -> t) -> t {
+    f(@BytesReader { bytes: bytes, pos: 0u } as @Reader)
 }
 
-pub pure fn with_str_reader<T>(s: &str, f: fn(Reader) -> T) -> T {
+pub pure fn with_str_reader<T>(s: &str, f: fn(@Reader) -> T) -> T {
     str::byte_slice(s, |bytes| with_bytes_reader(bytes, f))
 }