diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-09-14 20:27:36 -0700 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-09-16 14:37:48 -0700 |
| commit | fc525eeb4ec3443d29bce677f589b19f31c189bb (patch) | |
| tree | d807bad5c91171751157a945dde963dcfd4ea95e /src/libregex/parse.rs | |
| parent | d8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff) | |
| download | rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.tar.gz rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.zip | |
Fallout from renaming
Diffstat (limited to 'src/libregex/parse.rs')
| -rw-r--r-- | src/libregex/parse.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs index c3ce7bbd9f2..12555b7c443 100644 --- a/src/libregex/parse.rs +++ b/src/libregex/parse.rs @@ -418,13 +418,13 @@ impl<'a> Parser<'a> { if ranges.len() > 0 { let flags = negated | (self.flags & FLAG_NOCASE); let mut ast = Class(combine_ranges(ranges), flags); - for alt in alts.move_iter() { + for alt in alts.into_iter() { ast = Alt(box alt, box ast) } self.push(ast); } else if alts.len() > 0 { let mut ast = alts.pop().unwrap(); - for alt in alts.move_iter() { + for alt in alts.into_iter() { ast = Alt(box alt, box ast) } self.push(ast); @@ -961,7 +961,7 @@ fn combine_ranges(unordered: Vec<(char, char)>) -> Vec<(char, char)> { // This is currently O(n^2), but I think with sufficient cleverness, // it can be reduced to O(n) **if necessary**. let mut ordered: Vec<(char, char)> = Vec::with_capacity(unordered.len()); - for (us, ue) in unordered.move_iter() { + for (us, ue) in unordered.into_iter() { let (mut us, mut ue) = (us, ue); assert!(us <= ue); let mut which: Option<uint> = None; |
