Rename std::ioivec to std::io

8 files changed, 39 insertions, 39 deletions

diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 237a79efd16..3c0c27f472c 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -17,7 +17,7 @@ import std::uint;
 import std::time;
 import std::str;
 import std::int::range;
-import std::ioivec;
+import std::io;
 import std::getopts;
 import std::task;
 import std::u64;
@@ -94,7 +94,7 @@ fn main(argv: vec[str]) {
 
             let num_trials = 10;
 
-            let out = ioivec::stdout();
+            let out = io::stdout();
 
 
             for each n: int  in range(1, max + 1) {
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
index b0fb643fd1b..beddc7b4377 100644
--- a/src/test/bench/task-perf-word-count.rs
+++ b/src/test/bench/task-perf-word-count.rs
@@ -17,7 +17,7 @@ import std::str;
 import std::vec;
 import std::map;
 import std::ivec;
-import std::ioivec;
+import std::io;
 
 import std::time;
 import std::u64;
@@ -27,7 +27,7 @@ import clone = std::task::clone_chan;
 
 fn map(filename: str, emit: map_reduce::putter) {
     // log_err "mapping " + filename;
-    let f = ioivec::file_reader(filename);
+    let f = io::file_reader(filename);
 
 
     while true {
@@ -51,7 +51,7 @@ fn reduce(word: str, get: map_reduce::getter) {
         }
     }
 
-    // auto out = ioivec::stdout();
+    // auto out = io::stdout();
     // out.write_line(#fmt("%s: %d", word, count));
 
     // log_err "reduce " + word + " done.";
@@ -226,7 +226,7 @@ mod map_reduce {
 
 fn main(argv: vec[str]) {
     if vec::len(argv) < 2u {
-        let out = ioivec::stdout();
+        let out = io::stdout();
 
         out.write_line(#fmt("Usage: %s <filename> ...", argv.(0)));
 
@@ -251,7 +251,7 @@ fn main(argv: vec[str]) {
     log_err "MapReduce completed in " + u64::str(elapsed) + "ms";
 }
 
-fn read_word(r: ioivec::reader) -> option[str] {
+fn read_word(r: io::reader) -> option[str] {
     let w = "";
 
     while !r.eof() {
diff --git a/src/test/compiletest/header.rs b/src/test/compiletest/header.rs
index e2699ad4882..bd250073405 100644
--- a/src/test/compiletest/header.rs
+++ b/src/test/compiletest/header.rs
@@ -1,6 +1,6 @@
 import std::option;
 import std::str;
-import std::ioivec;
+import std::io;
 import std::fs;
 
 import common::config;
@@ -69,7 +69,7 @@ fn is_test_ignored(config: &config, testfile: &str) -> bool {
 }
 
 iter iter_header(testfile: &str) -> str {
-    let rdr = ioivec::file_reader(testfile);
+    let rdr = io::file_reader(testfile);
     while !rdr.eof() {
         let ln = rdr.read_line();
 
diff --git a/src/test/compiletest/procsrv.rs b/src/test/compiletest/procsrv.rs
index 290e0185ee3..94b77185652 100644
--- a/src/test/compiletest/procsrv.rs
+++ b/src/test/compiletest/procsrv.rs
@@ -12,7 +12,7 @@ import std::ivec;
 import std::os;
 import std::run;
 import std::unsafe;
-import std::ioivec;
+import std::io;
 import std::str;
 
 export handle;
@@ -73,8 +73,8 @@ fn run(handle: &handle, lib_path: &str,
 
 fn writeclose(fd: int, s: &option::t[str]) {
     if option::is_some(s) {
-        let writer = ioivec::new_writer(
-            ioivec::fd_buf_writer(fd, option::none));
+        let writer = io::new_writer(
+            io::fd_buf_writer(fd, option::none));
         writer.write_str(option::get(s));
     }
 
@@ -84,8 +84,8 @@ fn writeclose(fd: int, s: &option::t[str]) {
 fn readclose(fd: int) -> str {
     // Copied from run::program_output
     let file = os::fd_FILE(fd);
-    let reader = ioivec::new_reader(
-        ioivec::FILE_buf_reader(file, option::none));
+    let reader = io::new_reader(
+        io::FILE_buf_reader(file, option::none));
     let buf = "";
     while !reader.eof() {
         let bytes = reader.read_bytes(4096u);
diff --git a/src/test/compiletest/runtest.rs b/src/test/compiletest/runtest.rs
index 909838fd917..91aedb80301 100644
--- a/src/test/compiletest/runtest.rs
+++ b/src/test/compiletest/runtest.rs
@@ -1,4 +1,4 @@
-import std::ioivec;
+import std::io;
 import std::str;
 import std::option;
 import std::vec;
@@ -23,7 +23,7 @@ fn run(cx: &cx, testfile: &str) {
     test::configure_test_task();
     if (cx.config.verbose) {
         // We're going to be dumping a lot of info. Start on a new line.
-        ioivec::stdout().write_str("\n\n");
+        io::stdout().write_str("\n\n");
     }
     log #fmt("running %s", testfile);
     let props = load_props(testfile);
@@ -95,7 +95,7 @@ fn run_pretty_test(cx: &cx, props: &test_props, testfile: &str) {
       option::none. { 2 }
     };
 
-    let srcs = ~[ioivec::read_whole_file_str(testfile)];
+    let srcs = ~[io::read_whole_file_str(testfile)];
 
     let round = 0;
     while round < rounds {
@@ -114,7 +114,7 @@ fn run_pretty_test(cx: &cx, props: &test_props, testfile: &str) {
     let expected = alt props.pp_exact {
       option::some(file) {
         let filepath = fs::connect(fs::dirname(testfile), file);
-        ioivec::read_whole_file_str(filepath)
+        io::read_whole_file_str(filepath)
       }
       option::none. {
         srcs.(ivec::len(srcs) - 2u)
@@ -167,7 +167,7 @@ actual:\n\
 ------------------------------------------\n\
 \n",
                           expected, actual);
-            ioivec::stdout().write_str(msg);
+            io::stdout().write_str(msg);
             fail;
         }
     }
@@ -335,8 +335,8 @@ fn dump_output(config: &config, testfile: &str,
 fn dump_output_file(config: &config, testfile: &str,
                     out: &str, extension: &str) {
     let outfile = make_out_name(config, testfile, extension);
-    let writer = ioivec::file_writer(outfile,
-                                     ~[ioivec::create, ioivec::truncate]);
+    let writer = io::file_writer(outfile,
+                                     ~[io::create, io::truncate]);
     writer.write_str(out);
 }
 
@@ -370,15 +370,15 @@ fn maybe_dump_to_stdout(config: &config,
         let sep2 = #fmt("------%s------------------------------",
                         "stderr");
         let sep3 = "------------------------------------------";
-        ioivec::stdout().write_line(sep1);
-        ioivec::stdout().write_line(out);
-        ioivec::stdout().write_line(sep2);
-        ioivec::stdout().write_line(err);
-        ioivec::stdout().write_line(sep3);
+        io::stdout().write_line(sep1);
+        io::stdout().write_line(out);
+        io::stdout().write_line(sep2);
+        io::stdout().write_line(err);
+        io::stdout().write_line(sep3);
     }
 }
 
-fn error(err: &str) { ioivec::stdout().write_line(#fmt("\nerror: %s", err)); }
+fn error(err: &str) { io::stdout().write_line(#fmt("\nerror: %s", err)); }
 
 fn fatal(err: &str) -> ! { error(err); fail; }
 
@@ -397,6 +397,6 @@ stderr:\n\
 ------------------------------------------\n\
 \n",
              err, procres.cmdline, procres.stdout, procres.stderr);
-    ioivec::stdout().write_str(msg);
+    io::stdout().write_str(msg);
     fail;
 }
diff --git a/src/test/compiletest/util.rs b/src/test/compiletest/util.rs
index 5c2748837ae..5f971777c75 100644
--- a/src/test/compiletest/util.rs
+++ b/src/test/compiletest/util.rs
@@ -1,6 +1,6 @@
 import std::option;
 import std::generic_os::getenv;
-import std::ioivec;
+import std::io;
 
 import common::config;
 
@@ -25,5 +25,5 @@ fn lib_path_env_var() -> str { "PATH" }
 
 fn logv(config: &config, s: &str) {
     log s;
-    if config.verbose { ioivec::stdout().write_line(s); }
+    if config.verbose { io::stdout().write_line(s); }
 }
diff --git a/src/test/stdtest/io.rs b/src/test/stdtest/io.rs
index 6b94446f563..002592d9020 100644
--- a/src/test/stdtest/io.rs
+++ b/src/test/stdtest/io.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 use std;
-import std::ioivec;
+import std::io;
 import std::str;
 
 #[cfg(target_os = "linux")]
@@ -12,11 +12,11 @@ fn test_simple() {
     let frood: str = "A hoopy frood who really knows where his towel is.";
     log frood;
     {
-        let out: ioivec::writer =
-            ioivec::file_writer(tmpfile, ~[ioivec::create, ioivec::truncate]);
+        let out: io::writer =
+            io::file_writer(tmpfile, ~[io::create, io::truncate]);
         out.write_str(frood);
     }
-    let inp: ioivec::reader = ioivec::file_reader(tmpfile);
+    let inp: io::reader = io::file_reader(tmpfile);
     let frood2: str = inp.read_c_str();
     log frood2;
     assert (str::eq(frood, frood2));
diff --git a/src/test/stdtest/run.rs b/src/test/stdtest/run.rs
index 88becdd1bae..76ab7098043 100644
--- a/src/test/stdtest/run.rs
+++ b/src/test/stdtest/run.rs
@@ -1,7 +1,7 @@
 use std;
 import std::run;
 import std::os;
-import std::ioivec;
+import std::io;
 import std::option;
 import std::str;
 import std::ivec;
@@ -46,8 +46,8 @@ fn test_pipes() {
     assert expected == actual;
 
     fn writeclose(fd: int, s: &str) {
-        let writer = ioivec::new_writer(
-            ioivec::fd_buf_writer(fd, option::none));
+        let writer = io::new_writer(
+            io::fd_buf_writer(fd, option::none));
         writer.write_str(s);
 
         os::libc::close(fd);
@@ -56,8 +56,8 @@ fn test_pipes() {
     fn readclose(fd: int) -> str {
         // Copied from run::program_output
         let file = os::fd_FILE(fd);
-        let reader = ioivec::new_reader(
-            ioivec::FILE_buf_reader(file, option::none));
+        let reader = io::new_reader(
+            io::FILE_buf_reader(file, option::none));
         let buf = "";
         while !reader.eof() {
             let bytes = reader.read_bytes(4096u);