---

yaml
---
r: 54346
b: refs/heads/dist-snap
c: df66e8d
h: refs/heads/master
v: v3

Author: Kimundi

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 75d615d6f6d8fd8e931689106dfa22e4a6e662a2
+refs/heads/dist-snap: df66e8d4a197443c214e918a858208ecc38e9f1c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/str.rs

@@ -1865,8 +1865,10 @@ pub struct CharRange {
  * Given a byte position and a str, return the previous char and its position
  *
  * This function can be used to iterate over a unicode string in reverse.
+ *
+ * returns 0 for next index if called on start index 0
  */
-fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
+pub fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
     let mut prev = start;
 
     // while there is a previous byte == 10......
@@ -1875,7 +1877,12 @@ fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
     }
 
     // now refer to the initial byte of previous char
-    prev -= 1u;
+    if prev > 0u {
+        prev -= 1u;
+    } else {
+        prev = 0u;
+    }
+
 
     let ch = char_at(ss, prev);
     return CharRange {ch:ch, next:prev};
@@ -3761,4 +3768,10 @@ mod tests {
         "12345555".cmp(& &"123456") == Less;
         "22".cmp(& &"1234") == Greater;
     }
+
+    #[test]
+    fn test_char_range_at_reverse_underflow() {
+        assert!(char_range_at_reverse("abc", 0).next == 0);
+    }
+
 }