---

yaml
---
r: 48097
b: refs/heads/incoming
c: c33b4d9
h: refs/heads/master
i:
  48095: e79e589
v: v3

Author: apasel422

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 162c816e3434b9368313acc8ef000bad3ccbc218
+refs/heads/incoming: c33b4d98cca2eace9511b9ccfb072bc023b1697e
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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>

branches/incoming/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] {