---

yaml
---
r: 21853
b: refs/heads/snap-stage3
c: 8dc9e66
h: refs/heads/master
i:
  21851: 86bdeb7
v: v3

Author: erickt

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b73f801cc11ccddfe973112a040807cd164893f8
+refs/heads/snap-stage3: 8dc9e6643ae73c571c0543d3aed2d7461ded9289
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/io.rs

@@ -74,7 +74,7 @@ impl<T: Reader> T : ReaderUtil {
 impl Reader {
     fn read_chars(n: uint) -> ~[char] {
         // returns the (consumed offset, n_req), appends characters to &chars
-        fn chars_from_buf(buf: ~[u8], &chars: ~[char]) -> (uint, uint) {
+        fn chars_from_bytes(buf: ~[u8], &chars: ~[char]) -> (uint, uint) {
             let mut i = 0u;
             while i < vec::len(buf) {
                 let b0 = buf[i];
@@ -118,7 +118,7 @@ impl Reader {
                 break;
             }
             vec::push_all(buf, data);
-            let (offset, nbreq) = chars_from_buf(buf, chars);
+            let (offset, nbreq) = chars_from_bytes(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