---

yaml
---
r: 55678
b: refs/heads/master
c: 69eb218
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e782e1f37183b7ad7731cf0fbb474b55d199a9d5
+refs/heads/master: 69eb218ffccfba72258b091bb18f4cadf83343b9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

trunk/src/etc/x86.supp

@@ -583,7 +583,7 @@
 {
    llvm-optimization-reads-uninitialized-memory-3
    Memcheck:Cond
-   fun:_ZN4test9run_tests4anon13expr_fn_*
+   fun:_ZN4test9run_tests*
    ...
 }
 

trunk/src/libcore/rt/io/blocking/file.rs

@@ -9,79 +9,35 @@
 // except according to those terms.
 
 use prelude::*;
-use super::misc::PathLike;
-use super::{Reader, Writer, Seekable, Closeable};
-use super::{IoError, SeekStyle};
-
-/// Open a file with the default FileMode and FileAccess
-/// # XXX are there sane defaults here?
-pub fn open_file<P: PathLike>(_path: &P) -> FileStream { fail!() }
-
-/// # XXX
-/// * Ugh, this is ridiculous. What is the best way to represent these options?
-enum FileMode {
-    /// Opens an existing file. IoError if file does not exist.
-    Open,
-    /// Creates a file. IoError if file exists.
-    Create,
-    /// Opens an existing file or creates a new one.
-    OpenOrCreate,
-    /// Opens an existing file or creates a new one, positioned at EOF.
-    Append,
-    /// Opens an existing file, truncating it to 0 bytes.
-    Truncate,
-    /// Opens an existing file or creates a new one, truncating it to 0 bytes.
-    CreateOrTruncate,
-}
-
-enum FileAccess {
-    Read,
-    Write,
-    ReadWrite
-}
+use super::Stream;
 
 pub struct FileStream;
 
-impl FileStream {
-    pub fn open<P: PathLike>(_path: &P,
-                             _mode: FileMode,
-                             _access: FileAccess
-                            ) -> Result<FileStream, IoError> {
+pub impl FileStream {
+    fn new(_path: Path) -> FileStream {
         fail!()
     }
 }
 
-impl Reader for FileStream {
-    fn read(&mut self, _buf: &mut [u8]) -> Option<uint> {
+impl Stream for FileStream {
+    fn read(&mut self, _buf: &mut [u8]) -> uint {
         fail!()
     }
 
     fn eof(&mut self) -> bool {
         fail!()
     }
-}
-
-impl Writer for FileStream {
-    fn write(&mut self, _v: &[u8]) { fail!() }
 
-    fn flush(&mut self) { fail!() }
-}
-
-impl Seekable for FileStream {
-    fn tell(&self) -> u64 { fail!() }
-
-    fn seek(&mut self, _pos: i64, _style: SeekStyle) { fail!() }
-}
-
-impl Closeable for FileStream {
-    fn close(&mut self) { 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::open(filename, Create, Read).unwrap();
+    let filename = Path("test.txt");
+    let mut outstream = FileStream::new(filename);
     outstream.write(message.to_bytes());
 }