---

yaml
---
r: 44905
b: refs/heads/master
c: c33b4d9
h: refs/heads/master
i:
  44903: 1927b58
v: v3

Author: apasel422

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 162c816e3434b9368313acc8ef000bad3ccbc218
+refs/heads/master: c33b4d98cca2eace9511b9ccfb072bc023b1697e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/etc/kate/rust.xml

@@ -18,9 +18,7 @@
 		<item> drop </item>
 		<item> else </item>
 		<item> enum </item>
-		<item> export </item>
 		<item> extern </item>
-		<item> fail </item>
 		<item> for </item>
 		<item> if </item>
 		<item> impl </item>
@@ -29,7 +27,6 @@
 		<item> loop </item>
 		<item> match </item>
 		<item> mod </item>
-		<item> move </item>
 		<item> mut </item>
 		<item> priv </item>
 		<item> pub </item>

trunk/src/libcore/io.rs

@@ -78,9 +78,6 @@ pub trait ReaderUtil {
     /// Read len bytes into a new vec.
     fn read_bytes(&self, len: uint) -> ~[u8];
 
-    /// Read up until a specified character (which is not returned) or EOF.
-    fn read_until(&self, c: char) -> ~str;
-
     /// Read up until the first '\n' char (which is not returned), or EOF.
     fn read_line(&self) -> ~str;
 
@@ -184,22 +181,16 @@ impl<T:Reader> ReaderUtil for T {
         bytes
     }
 
-    fn read_until(&self, c: char) -> ~str {
+    fn read_line(&self) -> ~str {
         let mut bytes = ~[];
         loop {
             let ch = self.read_byte();
-            if ch == -1 || ch == c as int {
-                break;
-            }
+            if ch == -1 || ch == 10 { break; }
             bytes.push(ch as u8);
         }
         str::from_bytes(bytes)
     }
 
-    fn read_line(&self) -> ~str {
-        self.read_until('\n')
-    }
-
     fn read_chars(&self, n: uint) -> ~[char] {
         // returns the (consumed offset, n_req), appends characters to &chars
         fn chars_from_bytes<T:Reader>(bytes: &~[u8], chars: &mut ~[char])
@@ -271,7 +262,12 @@ impl<T:Reader> ReaderUtil for T {
     }
 
     fn read_c_str(&self) -> ~str {
-        self.read_until(0 as char)
+        let mut bytes: ~[u8] = ~[];
+        loop {
+            let ch = self.read_byte();
+            if ch < 1 { break; } else { bytes.push(ch as u8); }
+        }
+        str::from_bytes(bytes)
     }
 
     fn read_whole_stream(&self) -> ~[u8] {