---

yaml
---
r: 51439
b: refs/heads/incoming
c: 57e85b5
h: refs/heads/master
i:
  51437: b21c2c2
  51435: cca92e1
  51431: a5488b5
  51423: ab5ceb2
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 5e6dacf32edc5b8529e6f0aafd17754d0e2e2284
+refs/heads/incoming: 57e85b5f947387195cec1338fcb94b7cfb88bd86
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/Makefile.in

@@ -238,7 +238,7 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
 
 CORELIB_CRATE := $(S)src/libcore/core.rc
 CORELIB_INPUTS := $(wildcard $(addprefix $(S)src/libcore/,        \
-                                           core.rc *.rs */*.rs))
+                                           core.rc *.rs */*.rs */*/*rs))
 
 ######################################################################
 # Standard library variables

branches/incoming/src/libcore/rt/io/file.rs

@@ -0,0 +1,45 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use prelude::*;
+use super::super::sched::*;
+use super::super::rtio::*;
+use super::Stream;
+
+pub struct FileStream;
+
+pub impl FileStream {
+    static fn new(path: Path) -> FileStream {
+        fail!()
+    }
+}
+
+impl Stream for FileStream {
+    fn read(&mut self, buf: &mut [u8]) -> uint {
+        fail!()
+    }
+
+    fn eof(&mut self) -> bool {
+        fail!()
+    }
+
+    fn write(&mut self, v: &const [u8]) {
+        fail!()
+    }
+}
+
+#[test]
+#[ignore]
+fn super_simple_smoke_test_lets_go_read_some_files_and_have_a_good_time() {
+    let message = "it's alright. have a good time";
+    let filename = Path("test.txt");
+    let mut outstream = FileStream::new(filename);
+    outstream.write(message.to_bytes());
+}

branches/incoming/src/libcore/rt/io/mod.rs

@@ -0,0 +1,45 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use option::*;
+use comm::{GenericPort, GenericChan};
+
+pub mod file;
+
+// FIXME #5370 Strongly want this to be StreamError(&mut Stream)
+pub struct StreamError;
+
+// XXX: Can't put doc comments on macros
+// Raised by `Stream` instances on error. Returning `true` from the handler
+// indicates that the `Stream` should continue, `false` that it should fail.
+condition! {
+    stream_error: super::StreamError -> bool;
+}
+
+pub trait Stream {
+    /// Read bytes, up to the length of `buf` and place them in `buf`,
+    /// returning the number of bytes read or an `IoError`. Reads
+    /// 0 bytes on EOF.
+    ///
+    /// # Failure
+    ///
+    /// Raises the `reader_error` condition on error
+    fn read(&mut self, buf: &mut [u8]) -> uint;
+
+    /// Return whether the Reader has reached the end of the stream
+    fn eof(&mut self) -> bool;
+
+    /// Write the given buffer
+    ///
+    /// # Failure
+    ///
+    /// Raises the `writer_error` condition on error
+    fn write(&mut self, v: &const [u8]);
+}

branches/incoming/src/libcore/rt/mod.rs

@@ -34,6 +34,8 @@ mod rtio;
 pub mod uvll;
 mod uvio;
 mod uv;
+#[path = "io/mod.rs"]
+mod io;
 // FIXME #5248: The import in `sched` doesn't resolve unless this is pub!
 pub mod thread_local_storage;
 mod work_queue;