nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-26 14:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

std::str: Use CharOffsetIterator in .find() and .rfind()

Browse Source
This commit is contained in:
blake2-ppc 2013-08-18 13:57:35 +02:00
parent db3eb7291a
commit 595dd843d7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/str.rs
View File

@ -1790,10 +1790,8 @@ impl<'self> StrSlice<'self> for &'self str {
if search.matches(b as char) { return Some(i) }
}
} else {
let mut index = 0;
for c in self.iter() {
for (index, c) in self.char_offset_iter() {
if search.matches(c) { return Some(index); }
index += c.len_utf8_bytes();
}
}
@ -1807,15 +1805,14 @@ impl<'self> StrSlice<'self> for &'self str {
/// `Some` containing the byte index of the last matching character
/// or `None` if there is no match
fn rfind<C: CharEq>(&self, search: C) -> Option<uint> {
let mut index = self.len();
if search.only_ascii() {
let mut index = self.len();
for b in self.byte_rev_iter() {
index -= 1;
if search.matches(b as char) { return Some(index); }
}
} else {
for c in self.rev_iter() {
index -= c.len_utf8_bytes();
for (index, c) in self.char_offset_rev_iter() {
if search.matches(c) { return Some(index); }
}
}