OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missed merges

This commit is contained in:
Niko Matsakis 2011-11-15 20:35:36 -08:00
parent cbcdeb80d9
commit 62b298ee13
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/io.rs
View File

@ -390,14 +390,9 @@ fn buffered_file_buf_writer(path: str) -> result::t<buf_writer, str> {
// FIXME it would be great if this could be a const
<<<<<<< HEAD
// Problem seems to be that new_writer is not pure
fn stdout() -> writer { ret new_writer(fd_buf_writer(1, option::none)); }
fn stderr() -> writer { ret new_writer(fd_buf_writer(2, option::none)); }
=======
fn stdout() -> writer { ret new_writer(fd_buf_writer(1i32, option::none)); }
fn stderr() -> writer { ret new_writer(fd_buf_writer(2i32, option::none)); }
>>>>>>> refactor all unix types
fn print(s: str) { stdout().write_str(s); }
fn println(s: str) { stdout().write_str(s + "\n"); }