OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std::str: Fix bug in .slice_chars()

Browse Source 
`s.slice_chars(a, b)` did not allow the case where `a == s.len()`, this
is a bug I introduced last time I touched the method; add a test for
this case.
This commit is contained in:
blake2-ppc 2013-08-29 17:11:11 +02:00
parent d8801ceabc
commit 479aefb670
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstd/str.rs
View File

@ -1713,6 +1713,7 @@ impl<'self> StrSlice<'self> for &'self str {
if count == end { end_byte = Some(idx); break; } if count == end { end_byte = Some(idx); break; }
count += 1; count += 1;
} }
if begin_byte.is_none() && count == begin { begin_byte = Some(self.len()) }
if end_byte.is_none() && count == end { end_byte = Some(self.len()) } if end_byte.is_none() && count == end { end_byte = Some(self.len()) }
match (begin_byte, end_byte) { match (begin_byte, end_byte) {
@ -2700,8 +2701,11 @@ mod tests {
fn t(a: &str, b: &str, start: uint) { fn t(a: &str, b: &str, start: uint) {
assert_eq!(a.slice_chars(start, start + b.char_len()), b); assert_eq!(a.slice_chars(start, start + b.char_len()), b);
} }
t("", "", 0);
t("hello", "llo", 2); t("hello", "llo", 2);
t("hello", "el", 1); t("hello", "el", 1);
t("αβλ", "β", 1);
t("αβλ", "", 3);
assert_eq!("ะเทศไท", "ประเทศไทย中华Việt Nam".slice_chars(2, 8)); assert_eq!("ะเทศไท", "ประเทศไทย中华Việt Nam".slice_chars(2, 8));
} }