Refactoring ReaderUtil trait, combining it with the traitless impl on Reader

src/libcore/io.rs

@@ -48,6 +48,17 @@ trait Reader {
 trait ReaderUtil {
     fn read_bytes(len: uint) -> ~[u8];
     fn read_line() -> ~str;
+
+    fn read_chars(n: uint) -> ~[char];
+    fn read_char() -> char;
+    fn read_c_str() -> ~str;
+    fn read_le_uint(size: uint) -> uint;
+    fn read_le_int(size: uint) -> int;
+    fn read_be_uint(size: uint) -> uint;
+    fn read_whole_stream() -> ~[u8];
+    fn each_byte(it: fn(int) -> bool);
+    fn each_char(it: fn(char) -> bool);
+    fn each_line(it: fn(~str) -> bool);
 }
 
 impl<T: Reader> T : ReaderUtil {
@@ -69,12 +80,12 @@ impl<T: Reader> T : ReaderUtil {
         }
         str::from_bytes(buf)
     }
-}
 
-impl Reader {
     fn read_chars(n: uint) -> ~[char] {
         // returns the (consumed offset, n_req), appends characters to &chars
-        fn chars_from_bytes(buf: ~[u8], &chars: ~[char]) -> (uint, uint) {
+        fn chars_from_bytes<T: Reader>(buf: ~[u8], &chars: ~[char])
+            -> (uint, uint)
+        {
             let mut i = 0u;
             while i < vec::len(buf) {
                 let b0 = buf[i];
@@ -118,7 +129,7 @@ impl Reader {
                 break;
             }
             vec::push_all(buf, data);
-            let (offset, nbreq) = chars_from_bytes(buf, chars);
+            let (offset, nbreq) = chars_from_bytes::<T>(buf, chars);
             let ncreq = n - vec::len(chars);
             // again we either know we need a certain number of bytes
             // to complete a character, or we make sure we don't

src/libstd/json.rs

@@ -8,7 +8,7 @@
 
 use core::cmp::{Eq, Ord};
 use result::{Result, Ok, Err};
-use io::WriterUtil;
+use io::{WriterUtil, ReaderUtil};
 use map::HashMap;
 use map::Map;
 use sort::Sort;

src/libstd/time.rs

@@ -3,7 +3,7 @@
 
 use core::cmp::Eq;
 use libc::{c_char, c_int, c_long, size_t, time_t};
-use io::Reader;
+use io::{Reader, ReaderUtil};
 use result::{Result, Ok, Err};
 
 export

src/libsyntax/parse/comments.rs

@@ -1,4 +1,5 @@
 use io::println;//XXXXXXXXxxx
+use io::ReaderUtil;
 use util::interner;
 use lexer::{string_reader, bump, is_eof, nextch,
                is_whitespace, get_str_from, reader};

src/rustc/driver/rustc.rs

@@ -12,6 +12,7 @@ use core::*;
 
 // -*- rust -*-
 use result::{Ok, Err};
+use io::ReaderUtil;
 use std::getopts;
 use std::map::HashMap;
 use getopts::{opt_present};