---

yaml
---
r: 6053
b: refs/heads/master
c: 6f37acc
h: refs/heads/master
i:
  6051: 7ccd240
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0d60a7108bf022f743501b7b2e127fbae695260
+refs/heads/master: 6f37accb290e29f812b324853f991c2c575e0de6

trunk/src/lib/str.rs

@@ -11,7 +11,7 @@ export eq, lteq, hash, is_empty, is_not_empty, is_whitespace, byte_len, index,
        to_chars, char_len, char_at, bytes, is_ascii, shift_byte, pop_byte,
        unsafe_from_byte, unsafe_from_bytes, from_char, char_range_at,
        str_from_cstr, sbuf, as_buf, push_byte, utf8_char_width, safe_slice,
-       contains, chars;
+       contains, iter_chars;
 
 native "c-stack-cdecl" mod rustrt {
     fn rust_str_push(&s: str, ch: u8);
@@ -300,12 +300,12 @@ Pluck a character out of a string
 fn char_at(s: str, i: uint) -> char { ret char_range_at(s, i).ch; }
 
 /*
-Function: chars
+Function: iter_chars
 
 Iterate over the characters in a string
 */
 
-fn chars(s: str, it: block(char)) {
+fn iter_chars(s: str, it: block(char)) {
     let pos = 0u, len = byte_len(s);
     while (pos < len) {
         let {ch, next} = char_range_at(s, pos);

trunk/src/test/stdtest/str.rs

@@ -317,9 +317,9 @@ fn contains() {
 }
 
 #[test]
-fn chars() {
+fn iter_chars() {
     let i = 0;
-    str::chars("x\u03c0y") {|ch|
+    str::iter_chars("x\u03c0y") {|ch|
         alt i {
           0 { assert ch == 'x'; }
           1 { assert ch == '\u03c0'; }