auto merge of #10079 : alexcrichton/rust/no-reader-util, r=brson

These methods are all excellent candidates for default methods, so there's no need to require extra imports of various traits. Additionally, this was able to remove all the weird underscores after the method names. Yay!

3 files changed, 12 insertions, 13 deletions

diff --git a/src/libextra/json.rs b/src/libextra/json.rs
index 0aab7b743ba..9f75d677136 100644
--- a/src/libextra/json.rs
+++ b/src/libextra/json.rs
@@ -22,7 +22,6 @@ use std::f64;
 use std::hashmap::HashMap;
 use std::rt::io;
 use std::rt::io::Decorator;
-use std::rt::io::extensions::ReaderUtil;
 use std::rt::io::mem::MemWriter;
 use std::num;
 use std::str;
@@ -843,7 +842,7 @@ impl<T : Iterator<char>> Parser<T> {
 }
 
 /// Decodes a json value from an `&mut io::Reader`
-pub fn from_reader(mut rdr: &mut io::Reader) -> Result<Json, Error> {
+pub fn from_reader(rdr: &mut io::Reader) -> Result<Json, Error> {
     let s = str::from_utf8(rdr.read_to_end());
     let mut parser = Parser(~s.iter());
     parser.parse()
diff --git a/src/libextra/terminfo/parser/compiled.rs b/src/libextra/terminfo/parser/compiled.rs
index 0020f432114..b530c1b6334 100644
--- a/src/libextra/terminfo/parser/compiled.rs
+++ b/src/libextra/terminfo/parser/compiled.rs
@@ -16,7 +16,6 @@
 use std::{vec, str};
 use std::hashmap::HashMap;
 use std::rt::io;
-use std::rt::io::extensions::{ReaderByteConversions, ReaderUtil};
 use super::super::TermInfo;
 
 // These are the orders ncurses uses in its compiled format (as of 5.9). Not sure if portable.
@@ -161,7 +160,7 @@ pub static stringnames: &'static[&'static str] = &'static[ "cbt", "_", "cr", "cs
     "box1"];
 
 /// Parse a compiled terminfo entry, using long capability names if `longnames` is true
-pub fn parse(mut file: &mut io::Reader,
+pub fn parse(file: &mut io::Reader,
              longnames: bool) -> Result<~TermInfo, ~str> {
     let bnames;
     let snames;
@@ -178,17 +177,17 @@ pub fn parse(mut file: &mut io::Reader,
     }
 
     // Check magic number
-    let magic = file.read_le_u16_();
+    let magic = file.read_le_u16();
     if (magic != 0x011A) {
         return Err(format!("invalid magic number: expected {:x} but found {:x}",
                            0x011A, magic as uint));
     }
 
-    let names_bytes          = file.read_le_i16_() as int;
-    let bools_bytes          = file.read_le_i16_() as int;
-    let numbers_count        = file.read_le_i16_() as int;
-    let string_offsets_count = file.read_le_i16_() as int;
-    let string_table_bytes   = file.read_le_i16_() as int;
+    let names_bytes          = file.read_le_i16() as int;
+    let bools_bytes          = file.read_le_i16() as int;
+    let numbers_count        = file.read_le_i16() as int;
+    let string_offsets_count = file.read_le_i16() as int;
+    let string_table_bytes   = file.read_le_i16() as int;
 
     assert!(names_bytes          > 0);
 
@@ -247,7 +246,7 @@ pub fn parse(mut file: &mut io::Reader,
     let mut numbers_map = HashMap::new();
     if numbers_count != 0 {
         for i in range(0, numbers_count) {
-            let n = file.read_le_u16_();
+            let n = file.read_le_u16();
             if n != 0xFFFF {
                 debug!("{}\\#{}", nnames[i], n);
                 numbers_map.insert(nnames[i].to_owned(), n);
@@ -262,7 +261,7 @@ pub fn parse(mut file: &mut io::Reader,
     if string_offsets_count != 0 {
         let mut string_offsets = vec::with_capacity(10);
         for _ in range(0, string_offsets_count) {
-            string_offsets.push(file.read_le_u16_());
+            string_offsets.push(file.read_le_u16());
         }
 
         debug!("offsets: {:?}", string_offsets);
diff --git a/src/libextra/workcache.rs b/src/libextra/workcache.rs
index bdc8b95ad41..507962c0b1a 100644
--- a/src/libextra/workcache.rs
+++ b/src/libextra/workcache.rs
@@ -20,6 +20,7 @@ use std::comm::{PortOne, oneshot};
 use std::{os, str, task};
 use std::rt::io;
 use std::rt::io::Writer;
+use std::rt::io::Reader;
 use std::rt::io::Decorator;
 use std::rt::io::mem::MemWriter;
 use std::rt::io::file::FileInfo;
@@ -481,7 +482,7 @@ impl<'self, T:Send +
 #[test]
 fn test() {
     use std::{os, run};
-    use std::rt::io::ReaderUtil;
+    use std::rt::io::Reader;
     use std::str::from_utf8_owned;
 
     // Create a path to a new file 'filename' in the directory in which