about summary refs log tree commit diff
path: root/src/libregex
diff options
context:
space:
mode:
Diffstat (limited to 'src/libregex')
-rw-r--r--src/libregex/compile.rs2
-rw-r--r--src/libregex/parse.rs6
-rw-r--r--src/libregex/test/bench.rs2
-rw-r--r--src/libregex/vm.rs4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/libregex/compile.rs b/src/libregex/compile.rs
index ea472abeee6..869dd25e3fa 100644
--- a/src/libregex/compile.rs
+++ b/src/libregex/compile.rs
@@ -165,7 +165,7 @@ impl<'r> Compiler<'r> {
                 self.push(Save(2 * cap + 1));
             }
             Cat(xs) => {
-                for x in xs.move_iter() {
+                for x in xs.into_iter() {
                     self.compile(x)
                 }
             }
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;
diff --git a/src/libregex/test/bench.rs b/src/libregex/test/bench.rs
index aa85a68b5b5..be8e12b09f0 100644
--- a/src/libregex/test/bench.rs
+++ b/src/libregex/test/bench.rs
@@ -157,7 +157,7 @@ fn gen_text(n: uint) -> String {
     let mut rng = task_rng();
     let mut bytes = rng.gen_ascii_chars().map(|n| n as u8).take(n)
                        .collect::<Vec<u8>>();
-    for (i, b) in bytes.mut_iter().enumerate() {
+    for (i, b) in bytes.iter_mut().enumerate() {
         if i % 20 == 0 {
             *b = b'\n'
         }
diff --git a/src/libregex/vm.rs b/src/libregex/vm.rs
index 1adaf9c92a6..6db07923c4d 100644
--- a/src/libregex/vm.rs
+++ b/src/libregex/vm.rs
@@ -204,7 +204,7 @@ impl<'r, 't> Nfa<'r, 't> {
                         return StepMatch
                     }
                     Submatches => {
-                        for (slot, val) in groups.mut_iter().zip(caps.iter()) {
+                        for (slot, val) in groups.iter_mut().zip(caps.iter()) {
                             *slot = *val;
                         }
                         return StepMatch
@@ -470,7 +470,7 @@ impl Threads {
                 *t.groups.get_mut(1) = groups[1];
             }
             (false, Submatches) => {
-                for (slot, val) in t.groups.mut_iter().zip(groups.iter()) {
+                for (slot, val) in t.groups.iter_mut().zip(groups.iter()) {
                     *slot = *val;
                 }
             }