---

yaml
---
r: 32623
b: refs/heads/dist-snap
c: 8dc9e66
h: refs/heads/master
i:
  32621: 28abdad
  32619: eee57ed
  32615: f7d6df1
  32607: 8baf1a1
v: v3

Author: erickt

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: b73f801cc11ccddfe973112a040807cd164893f8
+refs/heads/dist-snap: 8dc9e6643ae73c571c0543d3aed2d7461ded9289
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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