Convert more core types to camel case

10 files changed, 43 insertions, 43 deletions

diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index 2b9a1dccb36..b22fe2b9582 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -1,4 +1,4 @@
-import io::reader;
+import io::Reader;
 
 trait to_base64 {
     fn to_base64() -> ~str;
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index ca58d6f5f86..5a587752093 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -172,13 +172,13 @@ fn doc_as_i32(d: doc) -> i32 { doc_as_u32(d) as i32 }
 fn doc_as_i64(d: doc) -> i64 { doc_as_u64(d) as i64 }
 
 // ebml writing
-type writer_ = {writer: io::writer, mut size_positions: ~[uint]};
+type writer_ = {writer: io::Writer, mut size_positions: ~[uint]};
 
 enum writer {
     writer_(writer_)
 }
 
-fn write_sized_vuint(w: io::writer, n: uint, size: uint) {
+fn write_sized_vuint(w: io::Writer, n: uint, size: uint) {
     match size {
       1u => w.write(&[0x80u8 | (n as u8)]),
       2u => w.write(&[0x40u8 | ((n >> 8_u) as u8), n as u8]),
@@ -190,7 +190,7 @@ fn write_sized_vuint(w: io::writer, n: uint, size: uint) {
     };
 }
 
-fn write_vuint(w: io::writer, n: uint) {
+fn write_vuint(w: io::Writer, n: uint) {
     if n < 0x7f_u { write_sized_vuint(w, n, 1u); return; }
     if n < 0x4000_u { write_sized_vuint(w, n, 2u); return; }
     if n < 0x200000_u { write_sized_vuint(w, n, 3u); return; }
@@ -198,7 +198,7 @@ fn write_vuint(w: io::writer, n: uint) {
     fail fmt!{"vint to write too big: %?", n};
 }
 
-fn writer(w: io::writer) -> writer {
+fn writer(w: io::Writer) -> writer {
     let size_positions: ~[uint] = ~[];
     return writer_({writer: w, mut size_positions: size_positions});
 }
@@ -220,10 +220,10 @@ impl writer {
     fn end_tag() {
         let last_size_pos = vec::pop::<uint>(self.size_positions);
         let cur_pos = self.writer.tell();
-        self.writer.seek(last_size_pos as int, io::seek_set);
+        self.writer.seek(last_size_pos as int, io::SeekSet);
         let size = (cur_pos - last_size_pos - 4u);
         write_sized_vuint(self.writer, size, 4u);
-        self.writer.seek(cur_pos as int, io::seek_set);
+        self.writer.seek(cur_pos as int, io::SeekSet);
 
         debug!{"End tag (size = %u)", size};
     }
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index f78e4be06da..715062a06c9 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -5,7 +5,7 @@
 
 import result::{result, ok, err};
 import io;
-import io::writer_util;
+import io::WriterUtil;
 import map;
 import map::hashmap;
 import map::map;
@@ -43,7 +43,7 @@ type error = {
 };
 
 /// Serializes a json value into a io::writer
-fn to_writer(wr: io::writer, j: json) {
+fn to_writer(wr: io::Writer, j: json) {
     match j {
       num(n) => wr.write_str(float::to_str(n, 6u)),
       string(s) => wr.write_str(escape_str(*s)),
@@ -109,7 +109,7 @@ fn to_str(j: json) -> ~str {
 }
 
 type parser_ = {
-    rdr: io::reader,
+    rdr: io::Reader,
     mut ch: char,
     mut line: uint,
     mut col: uint,
@@ -458,7 +458,7 @@ impl parser {
 }
 
 /// Deserializes a json value from an io::reader
-fn from_reader(rdr: io::reader) -> result<json, error> {
+fn from_reader(rdr: io::Reader) -> result<json, error> {
     let parser = parser_({
         rdr: rdr,
         mut ch: rdr.read_char(),
diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index 699cf7a66e9..e6f44d76b4c 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -2,7 +2,7 @@
 
 #[warn(deprecated_mode)];
 
-import io::writer_util;
+import io::WriterUtil;
 import to_str::ToStr;
 export hashmap, hashfn, eqfn, set, map, chained, hashmap, str_hash;
 export box_str_hash;
@@ -328,7 +328,7 @@ mod chained {
     }
 
     impl<K: copy ToStr, V: ToStr copy> t<K, V>: ToStr {
-        fn to_writer(wr: io::writer) {
+        fn to_writer(wr: io::Writer) {
             if self.count == 0u {
                 wr.write_str(~"{}");
                 return;
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index c32186fdd3c..b07c2fdfda7 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -8,7 +8,7 @@ import future_spawn = future::spawn;
 // should be able to, but can't atm, replace w/ result::{result, extensions};
 import result::*;
 import libc::size_t;
-import io::{reader, writer};
+import io::{Reader, Writer};
 
 // tcp interfaces
 export tcp_socket;
@@ -752,7 +752,7 @@ impl tcp_socket {
 }
 
 /// Implementation of `io::reader` trait for a buffered `net::tcp::tcp_socket`
-impl @tcp_socket_buf: io::reader {
+impl @tcp_socket_buf: io::Reader {
     fn read(buf: &[mut u8], len: uint) -> uint {
         // Loop until our buffer has enough data in it for us to read from.
         while self.data.buf.len() < len {
@@ -795,7 +795,7 @@ impl @tcp_socket_buf: io::reader {
     fn eof() -> bool {
         false // noop
     }
-    fn seek(dist: int, seek: io::seek_style) {
+    fn seek(dist: int, seek: io::SeekStyle) {
         log(debug, fmt!{"tcp_socket_buf seek stub %? %?", dist, seek});
         // noop
     }
@@ -805,7 +805,7 @@ impl @tcp_socket_buf: io::reader {
 }
 
 /// Implementation of `io::reader` trait for a buffered `net::tcp::tcp_socket`
-impl @tcp_socket_buf: io::writer {
+impl @tcp_socket_buf: io::Writer {
     fn write(data: &[const u8]) unsafe {
         let socket_data_ptr =
             ptr::addr_of(*((*(self.data)).sock).socket_data);
@@ -817,7 +817,7 @@ impl @tcp_socket_buf: io::writer {
                              err_data.err_name, err_data.err_msg});
         }
     }
-    fn seek(dist: int, seek: io::seek_style) {
+    fn seek(dist: int, seek: io::SeekStyle) {
       log(debug, fmt!{"tcp_socket_buf seek stub %? %?", dist, seek});
         // noop
     }
@@ -827,8 +827,8 @@ impl @tcp_socket_buf: io::writer {
     fn flush() -> int {
         0
     }
-    fn get_type() -> io::writer_type {
-        io::file
+    fn get_type() -> io::WriterType {
+        io::File
     }
 }
 
@@ -1441,11 +1441,11 @@ mod test {
             assert false;
         }
         let sock_buf = @socket_buf(result::unwrap(conn_result));
-        buf_write(sock_buf as io::writer, expected_req);
+        buf_write(sock_buf as io::Writer, expected_req);
 
         // so contrived!
         let actual_resp = do str::as_bytes(expected_resp) |resp_buf| {
-            buf_read(sock_buf as io::reader,
+            buf_read(sock_buf as io::Reader,
                      vec::len(resp_buf))
         };
 
@@ -1458,7 +1458,7 @@ mod test {
         assert str::contains(actual_resp, expected_resp);
     }
 
-    fn buf_write(+w: io::writer, val: ~str) {
+    fn buf_write(+w: io::Writer, val: ~str) {
         log(debug, fmt!{"BUF_WRITE: val len %?", str::len(val)});
         do str::byte_slice(val) |b_slice| {
             log(debug, fmt!{"BUF_WRITE: b_slice len %?",
@@ -1467,7 +1467,7 @@ mod test {
         }
     }
 
-    fn buf_read(+r: io::reader, len: uint) -> ~str {
+    fn buf_read(+r: io::Reader, len: uint) -> ~str {
         let new_bytes = r.read_bytes(len);
         log(debug, fmt!{"in buf_read.. new_bytes len: %?",
                         vec::len(new_bytes)});
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index e39eb777156..927fe75b1a9 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -2,7 +2,7 @@
 
 import map;
 import map::{hashmap, str_hash};
-import io::reader;
+import io::Reader;
 import dvec::dvec;
 
 export url, userinfo, query;
diff --git a/src/libstd/prettyprint.rs b/src/libstd/prettyprint.rs
index a33ad7ca65d..49fe0f4c0bf 100644
--- a/src/libstd/prettyprint.rs
+++ b/src/libstd/prettyprint.rs
@@ -1,8 +1,8 @@
-import io::writer;
-import io::writer_util;
+import io::Writer;
+import io::WriterUtil;
 import serialization::serializer;
 
-impl writer: serializer {
+impl Writer: serializer {
     fn emit_nil() {
         self.write_str(~"()")
     }
diff --git a/src/libstd/term.rs b/src/libstd/term.rs
index 0d311223847..be189151287 100644
--- a/src/libstd/term.rs
+++ b/src/libstd/term.rs
@@ -23,10 +23,10 @@ const color_bright_magenta: u8 = 13u8;
 const color_bright_cyan: u8 = 14u8;
 const color_bright_white: u8 = 15u8;
 
-fn esc(writer: io::writer) { writer.write(~[0x1bu8, '[' as u8]); }
+fn esc(writer: io::Writer) { writer.write(~[0x1bu8, '[' as u8]); }
 
 /// Reset the foreground and background colors to default
-fn reset(writer: io::writer) {
+fn reset(writer: io::Writer) {
     esc(writer);
     writer.write(~['0' as u8, 'm' as u8]);
 }
@@ -46,7 +46,7 @@ fn color_supported() -> bool {
         };
 }
 
-fn set_color(writer: io::writer, first_char: u8, color: u8) {
+fn set_color(writer: io::Writer, first_char: u8, color: u8) {
     assert (color < 16u8);
     esc(writer);
     let mut color = color;
@@ -55,12 +55,12 @@ fn set_color(writer: io::writer, first_char: u8, color: u8) {
 }
 
 /// Set the foreground color
-fn fg(writer: io::writer, color: u8) {
+fn fg(writer: io::Writer, color: u8) {
     return set_color(writer, '3' as u8, color);
 }
 
 /// Set the background color
-fn bg(writer: io::writer, color: u8) {
+fn bg(writer: io::Writer, color: u8) {
     return set_color(writer, '4' as u8, color);
 }
 
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index 104826afbac..9d33431f000 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -7,7 +7,7 @@
 
 import either::either;
 import result::{ok, err};
-import io::writer_util;
+import io::WriterUtil;
 import libc::size_t;
 import task::task_builder;
 
@@ -91,8 +91,8 @@ fn parse_opts(args: ~[~str]) -> opt_res {
 enum test_result { tr_ok, tr_failed, tr_ignored, }
 
 type console_test_state =
-    @{out: io::writer,
-      log_out: option<io::writer>,
+    @{out: io::Writer,
+      log_out: option<io::Writer>,
       use_color: bool,
       mut total: uint,
       mut passed: uint,
@@ -141,7 +141,7 @@ fn run_tests_console(opts: test_opts,
 
     let log_out = match opts.logfile {
         some(path) => match io::file_writer(path,
-                                            ~[io::create, io::truncate]) {
+                                            ~[io::Create, io::Truncate]) {
           result::ok(w) => some(w),
           result::err(s) => {
               fail(fmt!{"can't open output file: %s", s})
@@ -179,7 +179,7 @@ fn run_tests_console(opts: test_opts,
 
     return success;
 
-    fn write_log(out: io::writer, result: test_result, test: test_desc) {
+    fn write_log(out: io::Writer, result: test_result, test: test_desc) {
         out.write_line(fmt!{"%s %s",
                     match result {
                         tr_ok => ~"ok",
@@ -188,19 +188,19 @@ fn run_tests_console(opts: test_opts,
                     }, test.name});
     }
 
-    fn write_ok(out: io::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: io::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: io::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: io::writer, word: ~str, color: u8, use_color: bool) {
+    fn write_pretty(out: io::Writer, word: ~str, color: u8, use_color: bool) {
         if use_color && term::color_supported() {
             term::fg(out, color);
         }
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 3f6602ffcda..47dbff2ccb1 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -1,5 +1,5 @@
 import libc::{c_char, c_int, c_long, size_t, time_t};
-import io::reader;
+import io::Reader;
 import result::{result, ok, err};
 
 export