From 82b1e3f5cc0d0fec0f7fbab0f9b8766ce732c792 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 11 Aug 2011 18:49:36 -0700
Subject: Convert all uses of std::io to std::ioivec

---
 src/test/stdtest/io.rs  |  8 ++++----
 src/test/stdtest/run.rs | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/test/stdtest')

diff --git a/src/test/stdtest/io.rs b/src/test/stdtest/io.rs
index 08330c619fc..6b94446f563 100644
--- a/src/test/stdtest/io.rs
+++ b/src/test/stdtest/io.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 use std;
-import std::io;
+import std::ioivec;
 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: io::writer =
-            io::file_writer(tmpfile, [io::create, io::truncate]);
+        let out: ioivec::writer =
+            ioivec::file_writer(tmpfile, ~[ioivec::create, ioivec::truncate]);
         out.write_str(frood);
     }
-    let inp: io::reader = io::file_reader(tmpfile);
+    let inp: ioivec::reader = ioivec::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 47e29d69579..88becdd1bae 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::io;
+import std::ioivec;
 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 = io::new_writer(
-            io::fd_buf_writer(fd, option::none));
+        let writer = ioivec::new_writer(
+            ioivec::fd_buf_writer(fd, option::none));
         writer.write_str(s);
 
         os::libc::close(fd);
@@ -56,10 +56,11 @@ fn test_pipes() {
     fn readclose(fd: int) -> str {
         // Copied from run::program_output
         let file = os::fd_FILE(fd);
-        let reader = io::new_reader(io::FILE_buf_reader(file, option::none));
+        let reader = ioivec::new_reader(
+            ioivec::FILE_buf_reader(file, option::none));
         let buf = "";
         while !reader.eof() {
-            let bytes = ivec::from_vec(reader.read_bytes(4096u));
+            let bytes = reader.read_bytes(4096u);
             buf += str::unsafe_from_bytes(bytes);
         }
         os::libc::fclose(file);
-- 
cgit 1.4.1-3-g733a5