Convert more core types to camel case

6 files changed, 12 insertions, 12 deletions

diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index c71422d198f..38c8131147c 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -1,5 +1,5 @@
 import std::term;
-import io::writer_util;
+import io::WriterUtil;
 import codemap::span;
 
 export emitter, emit;
@@ -166,7 +166,7 @@ fn diagnosticcolor(lvl: level) -> u8 {
 
 fn print_diagnostic(topic: ~str, lvl: level, msg: ~str) {
     let use_color = term::color_supported() &&
-        io::stderr().get_type() == io::screen;
+        io::stderr().get_type() == io::Screen;
     if str::is_not_empty(topic) {
         io::stderr().write_str(fmt!{"%s ", topic});
     }
diff --git a/src/libsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs
index 3be74cba2e4..4ab3bb29045 100644
--- a/src/libsyntax/ext/log_syntax.rs
+++ b/src/libsyntax/ext/log_syntax.rs
@@ -1,5 +1,5 @@
 import base::*;
-import io::writer_util;
+import io::WriterUtil;
 
 fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, tt: ~[ast::token_tree])
     -> base::mac_result {
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index 3fdd5239e65..8664277bcdc 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -99,7 +99,7 @@ fn expand_include_bin(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
     }
 }
 
-fn res_rel_file(cx: ext_ctxt, sp: codemap::span, +arg: path) -> path {
+fn res_rel_file(cx: ext_ctxt, sp: codemap::span, +arg: Path) -> Path {
     // NB: relative paths are resolved relative to the compilation unit
     if !path::path_is_absolute(arg) {
         let cu = codemap::span_to_filename(sp, cx.codemap());
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index d3c17b81298..2da34539321 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -273,7 +273,7 @@ type lit = {lit: ~str, pos: uint};
 
 fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
                                 path: ~str,
-                                srdr: io::reader) ->
+                                srdr: io::Reader) ->
    {cmnts: ~[cmnt], lits: ~[lit]} {
     let src = @str::from_bytes(srdr.read_whole_stream());
     let itr = @interner::mk::<@~str>(
diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs
index a04b5ebe3c9..0d81d40ca8c 100644
--- a/src/libsyntax/print/pp.rs
+++ b/src/libsyntax/print/pp.rs
@@ -1,4 +1,4 @@
-import io::writer_util;
+import io::WriterUtil;
 import dvec::dvec;
 
 /*
@@ -95,7 +95,7 @@ type print_stack_elt = {offset: int, pbreak: print_stack_break};
 
 const size_infinity: int = 0xffff;
 
-fn mk_printer(out: io::writer, linewidth: uint) -> printer {
+fn mk_printer(out: io::Writer, linewidth: uint) -> printer {
     // Yes 3, it makes the ring buffers big enough to never
     // fall behind.
     let n: uint = 3u * linewidth;
@@ -201,7 +201,7 @@ fn mk_printer(out: io::writer, linewidth: uint) -> printer {
  * called 'print'.
  */
 type printer_ = {
-    out: io::writer,
+    out: io::Writer,
     buf_len: uint,
     mut margin: int, // width of lines we're constrained to
     mut space: int, // number of spaces left on line
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index f4b6b74d1b5..05b6ca8c504 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -48,7 +48,7 @@ fn end(s: ps) {
     pp::end(s.s);
 }
 
-fn rust_printer(writer: io::writer) -> ps {
+fn rust_printer(writer: io::Writer) -> ps {
     return @{s: pp::mk_printer(writer, default_columns),
              cm: none::<codemap>,
              intr: @interner::mk::<@~str>(|x| str::hash(*x),
@@ -61,7 +61,7 @@ fn rust_printer(writer: io::writer) -> ps {
              ann: no_ann()};
 }
 
-fn unexpanded_rust_printer(writer: io::writer, intr: ident_interner) -> ps {
+fn unexpanded_rust_printer(writer: io::Writer, intr: ident_interner) -> ps {
     return @{s: pp::mk_printer(writer, default_columns),
              cm: none::<codemap>,
              intr: intr,
@@ -83,8 +83,8 @@ const default_columns: uint = 78u;
 // copy forward.
 fn print_crate(cm: codemap, intr: @interner::interner<@~str>,
                span_diagnostic: diagnostic::span_handler,
-               crate: @ast::crate, filename: ~str, in: io::reader,
-               out: io::writer, ann: pp_ann, is_expanded: bool) {
+               crate: @ast::crate, filename: ~str, in: io::Reader,
+               out: io::Writer, ann: pp_ann, is_expanded: bool) {
     let r = comments::gather_comments_and_literals(span_diagnostic,
                                                    filename, in);
     let s =