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

auto merge of #9924 : metajack/rust/fix-starts-with-ends-with, r=huonw

Browse Source 
d4a32386f3 broke these since slice_to() and slice_from() must get character
boundaries, and arbitrary needle lengths don't necessarily map to character
boundaries of the haystack.

This also adds new tests that would have caught this bug.
This commit is contained in:
bors 2013-10-18 00:26:19 -07:00
commit 71c3f8c20c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/str.rs
View File

@ -2010,13 +2010,13 @@ impl<'self> StrSlice<'self> for &'self str {
#[inline] #[inline]
fn starts_with<'a>(&self, needle: &'a str) -> bool { fn starts_with<'a>(&self, needle: &'a str) -> bool {
let n = needle.len(); let n = needle.len();
self.len() >= n && needle == self.slice_to(n) self.len() >= n && needle.as_bytes() == self.as_bytes().slice_to(n)
} }
#[inline] #[inline]
fn ends_with(&self, needle: &str) -> bool { fn ends_with(&self, needle: &str) -> bool {
let (m, n) = (self.len(), needle.len()); let (m, n) = (self.len(), needle.len());
m >= n && needle == self.slice_from(m - n) m >= n && needle.as_bytes() == self.as_bytes().slice_from(m - n)
} }
fn escape_default(&self) -> ~str { fn escape_default(&self) -> ~str {
@ -2886,6 +2886,8 @@ mod tests {
assert!(("abc".starts_with("a"))); assert!(("abc".starts_with("a")));
assert!((!"a".starts_with("abc"))); assert!((!"a".starts_with("abc")));
assert!((!"".starts_with("abc"))); assert!((!"".starts_with("abc")));
assert!((!"ödd".starts_with("-")));
assert!(("ödd".starts_with("öd")));
} }
#[test] #[test]
@ -2895,6 +2897,8 @@ mod tests {
assert!(("abc".ends_with("c"))); assert!(("abc".ends_with("c")));
assert!((!"a".ends_with("abc"))); assert!((!"a".ends_with("abc")));
assert!((!"".ends_with("abc"))); assert!((!"".ends_with("abc")));
assert!((!"ddö".ends_with("-")));
assert!(("ddö".ends_with("dö")));
} }
#[test] #[test]