Skip to content

Commit d2943a4

Browse files
committed
---
yaml --- r: 51175 b: refs/heads/try c: fb5f020 h: refs/heads/master i: 51173: 35fdd0a 51171: d99bc78 51167: 356ad95 v: v3
1 parent 755e92a commit d2943a4

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: 4c58903454f5409c4b0cb2060ce869021dbf46c2
5+
refs/heads/try: fb5f020cc2d1d0972d2726413d1ec053990675ad
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/RELEASES.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Version 0.6 (April 2013)
3030
`@mut T`, `core::mut` or `core::cell`
3131
* `extern mod { ... }` is no longer valid syntax for foreign
3232
function modules. Use extern blocks: `extern { ... }`
33-
* Newtype enums removed. Use tuple-structs.
33+
* Newtype enums removed. Used tuple-structs.
3434
* Trait implementations no longer support visibility modifiers
3535
* Pattern matching over vectors improved and expanded
3636
* `const` renamed to `static` to correspond to lifetime name,
@@ -40,10 +40,6 @@ Version 0.6 (April 2013)
4040
`#[deriving(Clone)]`
4141
* Casts to traits must use a pointer sigil, e.g. `@foo as @Bar`
4242
instead of `foo as Bar`.
43-
* Fixed length vector types are now written as `[int, .. 3]`
44-
instead of `[int * 3]`.
45-
* Fixed length vector types can express the length as a constant
46-
expression. (ex: `[int, .. GL_BUFFER_SIZE - 2]`)
4743

4844
* Semantic changes
4945
* Types with owned pointers or custom destructors move by default,

branches/try/src/libcore/str.rs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,8 +1865,10 @@ pub struct CharRange {
18651865
* Given a byte position and a str, return the previous char and its position
18661866
*
18671867
* This function can be used to iterate over a unicode string in reverse.
1868+
*
1869+
* returns 0 for next index if called on start index 0
18681870
*/
1869-
fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
1871+
pub fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
18701872
let mut prev = start;
18711873

18721874
// while there is a previous byte == 10......
@@ -1875,7 +1877,12 @@ fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
18751877
}
18761878

18771879
// now refer to the initial byte of previous char
1878-
prev -= 1u;
1880+
if prev > 0u {
1881+
prev -= 1u;
1882+
} else {
1883+
prev = 0u;
1884+
}
1885+
18791886

18801887
let ch = char_at(ss, prev);
18811888
return CharRange {ch:ch, next:prev};
@@ -3761,4 +3768,10 @@ mod tests {
37613768
"12345555".cmp(& &"123456") == Less;
37623769
"22".cmp(& &"1234") == Greater;
37633770
}
3771+
3772+
#[test]
3773+
fn test_char_range_at_reverse_underflow() {
3774+
assert!(char_range_at_reverse("abc", 0).next == 0);
3775+
}
3776+
37643777
}

0 commit comments

Comments
 (0)