---

yaml
---
r: 11211
b: refs/heads/master
c: 14baf88
h: refs/heads/master
i:
  11209: a86f5ff
  11207: 047a017
v: v3

Author: killerswan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a131b430a0e2e227c8771212dc5f469cd08e5dce
+refs/heads/master: 14baf88f89241f1384e4d12b4751910fe16c947c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/str.rs

@@ -870,6 +870,30 @@ fn lines_iter(ss: str, ff: fn(&&str)) {
 Section: Searching
 */
 
+// Function: index
+//
+// Returns the index of the first matching char
+// (as option some/none)
+fn index(ss: str, cc: char) -> option<uint> {
+    let bii = 0u;
+    let cii = 0u;
+    let len = byte_len(ss);
+    while bii < len {
+        let {ch, next} = char_range_at(ss, bii);
+
+        // found here?
+        if ch == cc {
+            ret option::some(cii);
+        }
+
+        cii += 1u;
+        bii = next;
+    }
+
+    // wasn't found
+    ret option::none;
+}
+
 /*
 Function: index
 
@@ -1448,6 +1472,9 @@ mod tests {
         assert (index_byte("hello", 'e' as u8) == 1);
         assert (index_byte("hello", 'o' as u8) == 4);
         assert (index_byte("hello", 'z' as u8) == -1);
+        assert (index("hello", 'e') == option::some(1u));
+        assert (index("hello", 'o') == option::some(4u));
+        assert (index("hello", 'z') == option::none);
         assert (rindex_byte("hello", 'l' as u8) == 3);
         assert (rindex_byte("hello", 'h' as u8) == 0);
         assert (rindex_byte("hello", 'z' as u8) == -1);