---

yaml
---
r: 75705
b: refs/heads/master
c: 595dd84
h: refs/heads/master
i:
  75703: b0da52c
v: v3

Author: blake2-ppc

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: db3eb7291a3af1b88052f8ad87da79d62bd60b81
+refs/heads/master: 595dd843d7e2e38c08b4e03b79a0531d32d778fb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 67c954e365970e4c2cd06f0c50724656d7010f45
 refs/heads/try: 10089455287dcc3652b984ab4bfd6971e1b5f302

trunk/src/libstd/str.rs

@@ -1790,10 +1790,8 @@ impl<'self> StrSlice<'self> for &'self str {
                 if search.matches(b as char) { return Some(i) }
             }
         } else {
-            let mut index = 0;
-            for c in self.iter() {
+            for (index, c) in self.char_offset_iter() {
                 if search.matches(c) { return Some(index); }
-                index += c.len_utf8_bytes();
             }
         }
 
@@ -1807,15 +1805,14 @@ impl<'self> StrSlice<'self> for &'self str {
     /// `Some` containing the byte index of the last matching character
     /// or `None` if there is no match
     fn rfind<C: CharEq>(&self, search: C) -> Option<uint> {
-        let mut index = self.len();
         if search.only_ascii() {
+            let mut index = self.len();
             for b in self.byte_rev_iter() {
                 index -= 1;
                 if search.matches(b as char) { return Some(index); }
             }
         } else {
-            for c in self.rev_iter() {
-                index -= c.len_utf8_bytes();
+            for (index, c) in self.char_offset_rev_iter() {
                 if search.matches(c) { return Some(index); }
             }
         }