---

yaml
---
r: 14332
b: refs/heads/try
c: 042a522
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: d1c9b160adf5f13bca690e114f254b5353fe798d
+refs/heads/try: 042a5222d1f324a60b61bbc58f3938770d3e0cd0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/syntax/codemap.rs

@@ -157,7 +157,8 @@ fn span_to_lines(sp: span, cm: codemap::codemap) -> @file_lines {
 
 fn get_line(fm: filemap, line: int) -> str unsafe {
     let begin: uint = fm.lines[line].byte - fm.start_pos.byte;
-    let end = alt str::byte_index(*fm.src, '\n' as u8, begin) {
+    let end = alt str::byte_index_from(*fm.src, '\n' as u8, begin,
+                                  str::len(*fm.src)) {
       some(e) { e }
       none { str::len(*fm.src) }
     };

branches/try/src/libcore/str.rs

@@ -71,6 +71,7 @@ export
    // Searching
    index,
    byte_index,
+   byte_index_from,
    rindex,
    find,
    find_bytes,
@@ -859,13 +860,19 @@ fn index(ss: str, cc: char) -> option<uint> {
 //
 // Returns the index of the first matching byte
 // (as option some/none)
-fn byte_index(s: str, b: u8, start: uint) -> option<uint> {
-    let i = start, l = len_bytes(s);
-    while i < l {
-        if s[i] == b { ret some(i); }
-        i += 1u;
-    }
-    ret none;
+fn byte_index(s: str, b: u8) -> option<uint> {
+    byte_index_from(s, b, 0u, len_bytes(s))
+}
+
+// Function: byte_index_from
+//
+// Returns the index of the first matching byte within the range [`start`,
+// `end`).
+// (as option some/none)
+fn byte_index_from(s: str, b: u8, start: uint, end: uint) -> option<uint> {
+    assert end <= len_bytes(s);
+
+    str::as_bytes(s) { |v| vec::position_from(v, start, end) { |x| x == b } }
 }
 
 // Function: rindex