---

yaml
---
r: 11257
b: refs/heads/master
c: 6983464
h: refs/heads/master
i:
  11255: 24a28aa
v: v3

Author: killerswan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2600db4778dac418309320bed235a1025d84c630
+refs/heads/master: 69834646d2efd2170236b1f8db3a71c77e378c5b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/str.rs

@@ -920,7 +920,7 @@ fn find(haystack: str, needle: str) -> option<uint> {
 // Convert a byte position into a char position
 // within a given string
 fn b2c_pos(ss: str, bpos: uint) -> uint {
-   assert bpos < len_bytes(ss);
+   assert bpos == 0u || bpos < len_bytes(ss);
 
    let ii = 0u;
    let cpos = 0u;
@@ -1725,6 +1725,9 @@ mod tests {
     #[test]
     fn test_find_bytes() {
         // byte positions
+        assert (find_bytes("banana", "apple pie") == option::none);
+        assert (find_bytes("", "") == option::some(0u));
+
         let data = "ประเทศไทย中华Việt Nam";
         assert (find_bytes(data, "")     == option::some(0u));
         assert (find_bytes(data, "ประเ") == option::some( 0u));
@@ -1736,6 +1739,9 @@ mod tests {
     #[test]
     fn test_find() {
         // char positions
+        assert (find("banana", "apple pie") == option::none);
+        assert (find("", "") == option::some(0u));
+
         let data = "ประเทศไทย中华Việt Nam";
         assert (find(data, "")     == option::some(0u));
         assert (find(data, "ประเ") == option::some(0u));