rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

libstd: Fix merge fallout.

Browse Source
This commit is contained in:
Patrick Walton
2013-06-10 15:55:51 -07:00
committed by Corey Richardson
parent f463e69d20
commit 8cd40f9032
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libstd/str.rs
View File

@@ -357,7 +357,8 @@ impl<'self> Iterator<(uint, uint)> for StrMatchesIndexIterator<'self> {
fn next(&mut self) -> Option<(uint, uint)> { fn next(&mut self) -> Option<(uint, uint)> {
// See Issue #1932 for why this is a naive search // See Issue #1932 for why this is a naive search
let (h_len, n_len) = (self.haystack.len(), self.needle.len()); let (h_len, n_len) = (self.haystack.len(), self.needle.len());
let mut (match_start, match_i) = (0, 0); let mut match_start = 0;
let mut match_i = 0;
while self.position < h_len { while self.position < h_len {
if self.haystack[self.position] == self.needle[match_i] { if self.haystack[self.position] == self.needle[match_i] {
@@ -685,7 +686,7 @@ pub fn count_chars(s: &str, start: uint, end: uint) -> uint {
/// Counts the number of bytes taken by the first `n` chars in `s` /// Counts the number of bytes taken by the first `n` chars in `s`
/// starting from `start`. /// starting from `start`.
pub fn count_bytes<'b>(s: &'b str, start: uint, n: uint) -> uint { pub fn count_bytes<'b>(s: &'b str, start: uint, n: uint) -> uint {
assert!(is_char_boundary(s, start)); assert!(s.is_char_boundary(start));
let mut end = start; let mut end = start;
let mut cnt = n; let mut cnt = n;
let l = s.len(); let l = s.len();