Rename std::ioivec to std::io

7 files changed, 36 insertions, 36 deletions

diff --git a/src/lib/ebml.rs b/src/lib/ebml.rs
index 1fb5860b4a0..a843cdbcd79 100644
--- a/src/lib/ebml.rs
+++ b/src/lib/ebml.rs
@@ -117,9 +117,9 @@ fn doc_as_uint(d: doc) -> uint {
 
 
 // ebml writing
-type writer = {writer: ioivec::buf_writer, mutable size_positions: [uint]};
+type writer = {writer: io::buf_writer, mutable size_positions: [uint]};
 
-fn write_sized_vint(w: &ioivec::buf_writer, n: uint, size: uint) {
+fn write_sized_vint(w: &io::buf_writer, n: uint, size: uint) {
     let buf: [u8];
     alt size {
       1u { buf = ~[0x80u8 | (n as u8)]; }
@@ -139,7 +139,7 @@ fn write_sized_vint(w: &ioivec::buf_writer, n: uint, size: uint) {
     w.write(buf);
 }
 
-fn write_vint(w: &ioivec::buf_writer, n: uint) {
+fn write_vint(w: &io::buf_writer, n: uint) {
     if n < 0x7fu { write_sized_vint(w, n, 1u); ret; }
     if n < 0x4000u { write_sized_vint(w, n, 2u); ret; }
     if n < 0x200000u { write_sized_vint(w, n, 3u); ret; }
@@ -148,7 +148,7 @@ fn write_vint(w: &ioivec::buf_writer, n: uint) {
     fail;
 }
 
-fn create_writer(w: &ioivec::buf_writer) -> writer {
+fn create_writer(w: &io::buf_writer) -> writer {
     let size_positions: [uint] = ~[];
     ret {writer: w, mutable size_positions: size_positions};
 }
@@ -169,9 +169,9 @@ fn start_tag(w: &writer, tag_id: uint) {
 fn end_tag(w: &writer) {
     let last_size_pos = ivec::pop[uint](w.size_positions);
     let cur_pos = w.writer.tell();
-    w.writer.seek(last_size_pos as int, ioivec::seek_set);
+    w.writer.seek(last_size_pos as int, io::seek_set);
     write_sized_vint(w.writer, cur_pos - last_size_pos - 4u, 4u);
-    w.writer.seek(cur_pos as int, ioivec::seek_set);
+    w.writer.seek(cur_pos as int, io::seek_set);
 }
 // TODO: optionally perform "relaxations" on end_tag to more efficiently
 // encode sizes; this is a fixed point iteration
diff --git a/src/lib/ioivec.rs b/src/lib/io.rs
index 382e93479e1..382e93479e1 100644
--- a/src/lib/ioivec.rs
+++ b/src/lib/io.rs
diff --git a/src/lib/run_program.rs b/src/lib/run_program.rs
index 3b5751c806f..7db81f96d5b 100644
--- a/src/lib/run_program.rs
+++ b/src/lib/run_program.rs
@@ -36,9 +36,9 @@ fn run_program(prog: str, args: vec[str]) -> int {
 type program =
     obj {
         fn get_id() -> int;
-        fn input() -> ioivec::writer;
-        fn output() -> ioivec::reader;
-        fn err() -> ioivec::reader;
+        fn input() -> io::writer;
+        fn output() -> io::reader;
+        fn err() -> io::reader;
         fn close_input();
         fn finish() -> int;
         fn destroy();
@@ -65,17 +65,17 @@ fn start_program(prog: str, args: vec[str]) -> @program_res {
                     err_file: os::libc::FILE,
                     mutable finished: bool) {
         fn get_id() -> int { ret pid; }
-        fn input() -> ioivec::writer {
-            ret ioivec::new_writer(
-                ioivec::fd_buf_writer(in_fd, option::none));
+        fn input() -> io::writer {
+            ret io::new_writer(
+                io::fd_buf_writer(in_fd, option::none));
         }
-        fn output() -> ioivec::reader {
-            ret ioivec::new_reader(
-                ioivec::FILE_buf_reader(out_file, option::none));
+        fn output() -> io::reader {
+            ret io::new_reader(
+                io::FILE_buf_reader(out_file, option::none));
         }
-        fn err() -> ioivec::reader {
-            ret ioivec::new_reader(
-                ioivec::FILE_buf_reader(err_file, option::none));
+        fn err() -> io::reader {
+            ret io::new_reader(
+                io::FILE_buf_reader(err_file, option::none));
         }
         fn close_input() {
             let invalid_fd = -1;
@@ -103,7 +103,7 @@ fn start_program(prog: str, args: vec[str]) -> @program_res {
                                  false));
 }
 
-fn read_all(rd: &ioivec::reader) -> str {
+fn read_all(rd: &io::reader) -> str {
     let buf = "";
     while !rd.eof() {
         let bytes = rd.read_bytes(4096u);
diff --git a/src/lib/std.rc b/src/lib/std.rc
index 6f642e1954b..eee4630db20 100644
--- a/src/lib/std.rc
+++ b/src/lib/std.rc
@@ -20,7 +20,7 @@ mod str;
 
 // General io and system-services modules.
 
-mod ioivec;
+mod io;
 mod sys;
 mod task;
 mod comm;
diff --git a/src/lib/term.rs b/src/lib/term.rs
index d13b0dee3de..f61611a9a15 100644
--- a/src/lib/term.rs
+++ b/src/lib/term.rs
@@ -40,9 +40,9 @@ const color_bright_cyan: u8 = 14u8;
 
 const color_bright_white: u8 = 15u8;
 
-fn esc(writer: ioivec::buf_writer) { writer.write(~[0x1bu8, '[' as u8]); }
+fn esc(writer: io::buf_writer) { writer.write(~[0x1bu8, '[' as u8]); }
 
-fn reset(writer: ioivec::buf_writer) {
+fn reset(writer: io::buf_writer) {
     esc(writer);
     writer.write(~['0' as u8, 'm' as u8]);
 }
@@ -55,18 +55,18 @@ fn color_supported() -> bool {
         };
 }
 
-fn set_color(writer: ioivec::buf_writer, first_char: u8, color: u8) {
+fn set_color(writer: io::buf_writer, first_char: u8, color: u8) {
     assert (color < 16u8);
     esc(writer);
     if color >= 8u8 { writer.write(~['1' as u8, ';' as u8]); color -= 8u8; }
     writer.write(~[first_char, ('0' as u8) + color, 'm' as u8]);
 }
 
-fn fg(writer: ioivec::buf_writer, color: u8) {
+fn fg(writer: io::buf_writer, color: u8) {
     ret set_color(writer, '3' as u8, color);
 }
 
-fn bg(writer: ioivec::buf_writer, color: u8) {
+fn bg(writer: io::buf_writer, color: u8) {
     ret set_color(writer, '4' as u8, color);
 }
 // export fg;
diff --git a/src/lib/termivec.rs b/src/lib/termivec.rs
index 29477ec925f..4d635e780b2 100644
--- a/src/lib/termivec.rs
+++ b/src/lib/termivec.rs
@@ -40,9 +40,9 @@ const color_bright_cyan: u8 = 14u8;
 
 const color_bright_white: u8 = 15u8;
 
-fn esc(writer: ioivec::buf_writer) { writer.write(~[0x1bu8, '[' as u8]); }
+fn esc(writer: io::buf_writer) { writer.write(~[0x1bu8, '[' as u8]); }
 
-fn reset(writer: ioivec::buf_writer) {
+fn reset(writer: io::buf_writer) {
     esc(writer);
     writer.write(~['0' as u8, 'm' as u8]);
 }
@@ -60,18 +60,18 @@ fn color_supported() -> bool {
         };
 }
 
-fn set_color(writer: ioivec::buf_writer, first_char: u8, color: u8) {
+fn set_color(writer: io::buf_writer, first_char: u8, color: u8) {
     assert (color < 16u8);
     esc(writer);
     if color >= 8u8 { writer.write(~['1' as u8, ';' as u8]); color -= 8u8; }
     writer.write(~[first_char, ('0' as u8) + color, 'm' as u8]);
 }
 
-fn fg(writer: ioivec::buf_writer, color: u8) {
+fn fg(writer: io::buf_writer, color: u8) {
     ret set_color(writer, '3' as u8, color);
 }
 
-fn bg(writer: ioivec::buf_writer, color: u8) {
+fn bg(writer: io::buf_writer, color: u8) {
     ret set_color(writer, '4' as u8, color);
 }
 // export fg;
diff --git a/src/lib/test.rs b/src/lib/test.rs
index 04472088789..70f9580bf73 100644
--- a/src/lib/test.rs
+++ b/src/lib/test.rs
@@ -106,7 +106,7 @@ fn run_tests_console_(opts: &test_opts, tests: &[test_desc],
                       to_task: &test_to_task) -> bool {
 
     type test_state = @{
-        out: ioivec::writer,
+        out: io::writer,
         use_color: bool,
         mutable total: uint,
         mutable passed: uint,
@@ -148,7 +148,7 @@ fn run_tests_console_(opts: &test_opts, tests: &[test_desc],
     }
 
     let st = @{
-        out: ioivec::stdout(),
+        out: io::stdout(),
         use_color: use_color(),
         mutable total: 0u,
         mutable passed: 0u,
@@ -181,19 +181,19 @@ fn run_tests_console_(opts: &test_opts, tests: &[test_desc],
 
     ret success;
 
-    fn write_ok(out: &ioivec::writer, use_color: bool) {
+    fn write_ok(out: &io::writer, use_color: bool) {
         write_pretty(out, "ok", term::color_green, use_color);
     }
 
-    fn write_failed(out: &ioivec::writer, use_color: bool) {
+    fn write_failed(out: &io::writer, use_color: bool) {
         write_pretty(out, "FAILED", term::color_red, use_color);
     }
 
-    fn write_ignored(out: &ioivec::writer, use_color: bool) {
+    fn write_ignored(out: &io::writer, use_color: bool) {
         write_pretty(out, "ignored", term::color_yellow, use_color);
     }
 
-    fn write_pretty(out: &ioivec::writer, word: &str, color: u8,
+    fn write_pretty(out: &io::writer, word: &str, color: u8,
                     use_color: bool) {
         if use_color && term::color_supported() {
             term::fg(out.get_buf_writer(), color);