rustc: Move much of metadata reading over to interior vectors

2 files changed, 9 insertions, 9 deletions

diff --git a/src/comp/syntax/print/pp.rs b/src/comp/syntax/print/pp.rs
index ef3a87585c4..7ac10f6bcf0 100644
--- a/src/comp/syntax/print/pp.rs
+++ b/src/comp/syntax/print/pp.rs
@@ -1,5 +1,5 @@
 
-import std::io;
+import std::ioivec;
 import std::vec;
 import std::str;
 
@@ -98,7 +98,7 @@ type print_stack_elt = rec(int offset, print_stack_break pbreak);
 
 const int size_infinity = 0xffff;
 
-fn mk_printer(io::writer out, uint linewidth) -> printer {
+fn mk_printer(ioivec::writer out, uint linewidth) -> printer {
     // Yes 3, it makes the ring buffers big enough to never
     // fall behind.
 
@@ -198,7 +198,7 @@ fn mk_printer(io::writer out, uint linewidth) -> printer {
  * the method called 'pretty_print', and the 'PRINT' process is the method
  * called 'print'.
  */
-obj printer(io::writer out,
+obj printer(ioivec::writer out,
             uint buf_len,
             mutable int margin, // width of lines we're constrained to
 
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index 41ba5715d3b..dd3d98fb45b 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -1,7 +1,7 @@
 
 import std::ivec;
 import std::int;
-import std::io;
+import std::ioivec;
 import std::str;
 import std::uint;
 import std::vec;
@@ -57,7 +57,7 @@ fn ibox(&ps s, uint u) {
 
 fn end(&ps s) { ivec::pop(s.boxes); pp::end(s.s); }
 
-fn rust_printer(io::writer writer) -> ps {
+fn rust_printer(ioivec::writer writer) -> ps {
     let pp::breaks[] boxes = ~[];
     ret @rec(s=pp::mk_printer(writer, default_columns),
              cm=none[codemap],
@@ -74,7 +74,7 @@ const uint indent_unit = 4u;
 const uint default_columns = 78u;
 
 fn print_crate(&codemap cm, @ast::crate crate, str filename,
-               io::writer out, &pp_ann ann) {
+               ioivec::writer out, &pp_ann ann) {
     let pp::breaks[] boxes = ~[];
     auto r = lexer::gather_comments_and_literals(cm, filename);
     auto s =
@@ -104,7 +104,7 @@ fn item_to_str(&@ast::item i) -> str { be to_str(i, print_item); }
 fn path_to_str(&ast::path p) -> str { be to_str(p, print_path); }
 
 fn fun_to_str(&ast::_fn f, str name, &ast::ty_param[] params) -> str {
-    auto writer = io::string_writer();
+    auto writer = ioivec::string_writer();
     auto s = rust_printer(writer.get_writer());
     print_fn(s, f.decl, f.proto, name, params);
     eof(s.s);
@@ -112,7 +112,7 @@ fn fun_to_str(&ast::_fn f, str name, &ast::ty_param[] params) -> str {
 }
 
 fn block_to_str(&ast::block blk) -> str {
-    auto writer = io::string_writer();
+    auto writer = ioivec::string_writer();
     auto s = rust_printer(writer.get_writer());
     // containing cbox, will be closed by print-block at }
 
@@ -1505,7 +1505,7 @@ fn escape_str(str st, char to_escape) -> str {
 }
 
 fn to_str[T](&T t, fn(&ps, &T)  f) -> str {
-    auto writer = io::string_writer();
+    auto writer = ioivec::string_writer();
     auto s = rust_printer(writer.get_writer());
     f(s, t);
     eof(s.s);