about summary refs log tree commit diff
path: root/src/libgreen
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2014-09-14 20:27:36 -0700
committerAaron Turon <aturon@mozilla.com>2014-09-16 14:37:48 -0700
commitfc525eeb4ec3443d29bce677f589b19f31c189bb (patch)
treed807bad5c91171751157a945dde963dcfd4ea95e /src/libgreen
parentd8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff)
downloadrust-fc525eeb4ec3443d29bce677f589b19f31c189bb.tar.gz
rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.zip
Fallout from renaming
Diffstat (limited to 'src/libgreen')
-rw-r--r--src/libgreen/basic.rs6
-rw-r--r--src/libgreen/lib.rs8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libgreen/basic.rs b/src/libgreen/basic.rs
index e48786f3374..27c71cb3e7c 100644
--- a/src/libgreen/basic.rs
+++ b/src/libgreen/basic.rs
@@ -53,7 +53,7 @@ impl BasicLoop {
     /// Process everything in the work queue (continually)
     fn work(&mut self) {
         while self.work.len() > 0 {
-            for work in mem::replace(&mut self.work, vec![]).move_iter() {
+            for work in mem::replace(&mut self.work, vec![]).into_iter() {
                 work();
             }
         }
@@ -63,7 +63,7 @@ impl BasicLoop {
         let messages = unsafe {
             mem::replace(&mut *self.messages.lock(), Vec::new())
         };
-        for message in messages.move_iter() {
+        for message in messages.into_iter() {
             self.message(message);
         }
     }
@@ -71,7 +71,7 @@ impl BasicLoop {
     fn message(&mut self, message: Message) {
         match message {
             RunRemote(i) => {
-                match self.remotes.mut_iter().find(|& &(id, _)| id == i) {
+                match self.remotes.iter_mut().find(|& &(id, _)| id == i) {
                     Some(&(_, ref mut f)) => f.call(),
                     None => unreachable!()
                 }
diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
index cc77d151231..00f246ea05e 100644
--- a/src/libgreen/lib.rs
+++ b/src/libgreen/lib.rs
@@ -435,7 +435,7 @@ impl SchedPool {
         // Now that we've got all our work queues, create one scheduler per
         // queue, spawn the scheduler into a thread, and be sure to keep a
         // handle to the scheduler and the thread to keep them alive.
-        for worker in workers.move_iter() {
+        for worker in workers.into_iter() {
             rtdebug!("inserting a regular scheduler");
 
             let mut sched = box Scheduler::new(pool.id,
@@ -493,7 +493,7 @@ impl SchedPool {
 
         // Tell all existing schedulers about this new scheduler so they can all
         // steal work from it
-        for handle in self.handles.mut_iter() {
+        for handle in self.handles.iter_mut() {
             handle.send(NewNeighbor(stealer.clone()));
         }
 
@@ -535,10 +535,10 @@ impl SchedPool {
         }
 
         // Now that everyone's gone, tell everything to shut down.
-        for mut handle in replace(&mut self.handles, vec![]).move_iter() {
+        for mut handle in replace(&mut self.handles, vec![]).into_iter() {
             handle.send(Shutdown);
         }
-        for thread in replace(&mut self.threads, vec![]).move_iter() {
+        for thread in replace(&mut self.threads, vec![]).into_iter() {
             thread.join();
         }
     }