comp/std: rename io::string_reader to io::str_reader.

Author: erickt

src/fuzzer/fuzzer.rs

@@ -268,7 +268,7 @@ fn check_variants_T<T: copy>(
                         diagnostic::mk_span_handler(handler, codemap),
                         crate2,
                         filename,
-                        io::string_reader(""), _,
+                        io::str_reader(""), _,
                         pprust::no_ann()));
                 alt cx.mode {
                   tm_converge {
@@ -416,7 +416,7 @@ fn parse_and_print(code: @str) -> str {
                                         sess.span_diagnostic,
                                         crate,
                                         filename,
-                                        io::string_reader(*code), _,
+                                        io::str_reader(*code), _,
                                         pprust::no_ann()));
 }
 
@@ -562,7 +562,7 @@ fn check_variants(files: [str], cx: context) {
                                                sess.span_diagnostic,
                                                crate,
                                                file,
-                                               io::string_reader(*s), _,
+                                               io::str_reader(*s), _,
                                                pprust::no_ann())));
         check_variants_of_ast(*crate, sess.cm, file, cx);
     }

src/libstd/io.rs

@@ -270,7 +270,7 @@ fn with_bytes_reader_between<t>(bytes: [u8], start: uint, end: uint,
     f(bytes_reader_between(bytes, start, end))
 }
 
-fn string_reader(s: str) -> reader {
+fn str_reader(s: str) -> reader {
     bytes_reader(str::bytes(s))
 }
 
@@ -662,7 +662,7 @@ mod tests {
 
     #[test]
     fn test_readchars_empty() {
-        let inp : io::reader = io::string_reader("");
+        let inp : io::reader = io::str_reader("");
         let res : [char] = inp.read_chars(128u);
         assert(vec::len(res) == 0u);
     }
@@ -677,7 +677,7 @@ mod tests {
             29983, 38152, 30340, 27748,
             21273, 20999, 32905, 27748];
         fn check_read_ln(len : uint, s: str, ivals: [int]) {
-            let inp : io::reader = io::string_reader(s);
+            let inp : io::reader = io::str_reader(s);
             let res : [char] = inp.read_chars(len);
             if (len <= vec::len(ivals)) {
                 assert(vec::len(res) == len);
@@ -696,14 +696,14 @@ mod tests {
 
     #[test]
     fn test_readchar() {
-        let inp : io::reader = io::string_reader("生");
+        let inp : io::reader = io::str_reader("生");
         let res : char = inp.read_char();
         assert(res as int == 29983);
     }
 
     #[test]
     fn test_readchar_empty() {
-        let inp : io::reader = io::string_reader("");
+        let inp : io::reader = io::str_reader("");
         let res : char = inp.read_char();
         assert(res as int == -1);
     }

src/rustc/driver/driver.rs

@@ -273,7 +273,7 @@ fn pretty_print_input(sess: session, cfg: ast::crate_cfg, input: str,
     }
     let src = codemap::get_filemap(sess.codemap, input).src;
     pprust::print_crate(sess.codemap, sess.span_diagnostic, crate, input,
-                        io::string_reader(*src), io::stdout(), ann);
+                        io::str_reader(*src), io::stdout(), ann);
 }
 
 fn get_os(triple: str) -> option<session::os> {

src/test/bench/task-perf-word-count.rs

@@ -21,7 +21,7 @@ import comm::recv;
 import comm::send;
 
 fn map(input: str, emit: map_reduce::putter) {
-    let f = io::string_reader(input);
+    let f = io::str_reader(input);
 
 
     while true {
@@ -451,4 +451,4 @@ convallis. Integer non tellus ante. Nulla hendrerit lobortis augue sit
 amet vulputate. Donec cursus hendrerit diam convallis
 luctus. Curabitur ipsum mauris, fermentum quis tincidunt ac, laoreet
 sollicitudin sapien. Fusce velit urna, gravida non pulvinar eu, tempor
-id nunc.  " }
+id nunc.  " }