---

yaml
---
r: 49534
b: refs/heads/master
c: 29e8b6e
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 12df65470fb8c5d57fb4f94d37557daa6282173f
+refs/heads/master: 29e8b6ea9b63c5cc1cd91cc5eb756820f7fe50b7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/libcore/str.rs

@@ -1020,22 +1020,21 @@ pub fn each_chari(s: &str, it: &fn(uint, char) -> bool) {
 /// Iterates over the chars in a string in reverse
 #[inline(always)]
 pub fn each_char_reverse(s: &str, it: &fn(char) -> bool) {
-    let mut pos = 0;
-    let len = s.char_len();
-    while pos > 0 {
-        let CharRange {ch, next} = char_range_at_reverse(s, pos);
-        pos = next;
-        if !it(ch) { break; }
-    }
+    each_chari_reverse(s, |_, c| it(c))
 }
 
 // Iterates over the chars in a string in reverse, with indices
 #[inline(always)]
 pub fn each_chari_reverse(s: &str, it: &fn(uint, char) -> bool) {
+    let mut pos = s.len();
     let mut ch_pos = s.char_len();
-    for s.each_char_reverse |ch| {
+    while pos > 0 {
+        let CharRange {ch, next} = char_range_at_reverse(s, pos);
+        pos = next;
         ch_pos -= 1;
+
         if !it(ch_pos, ch) { break; }
+
     }
 }
 
@@ -3661,10 +3660,10 @@ mod tests {
     fn test_each_char_reverse() {
         let s = ~"ศไทย中华Việt Nam";
         let v = ~['ศ','ไ','ท','ย','中','华','V','i','ệ','t',' ','N','a','m'];
-        let mut pos = 0;
+        let mut pos = v.len();
         for s.each_char_reverse |ch| {
+            pos -= 1;
             fail_unless!(ch == v[pos]);
-            pos += 1;
         }
     }