about summary refs log tree commit diff
path: root/src/libcore/rt
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-05-12 15:08:07 -0700
committerBrian Anderson <banderson@mozilla.com>2013-05-15 12:19:16 -0700
commit7f5746f6d2bcc048aca5ddfbfdf41497ab874836 (patch)
tree69ced4fcba27a4a5f7ba02ab3fdcbb7596be43bb /src/libcore/rt
parent56c0b188b66f71f55e2d577ca4a23830a31433e6 (diff)
downloadrust-7f5746f6d2bcc048aca5ddfbfdf41497ab874836.tar.gz
rust-7f5746f6d2bcc048aca5ddfbfdf41497ab874836.zip
core::rt: Rename Sched.task_queue to work_queue
Diffstat (limited to 'src/libcore/rt')
-rw-r--r--src/libcore/rt/sched.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/rt/sched.rs b/src/libcore/rt/sched.rs
index 3469997833c..1e4a9c87a68 100644
--- a/src/libcore/rt/sched.rs
+++ b/src/libcore/rt/sched.rs
@@ -31,7 +31,7 @@ pub mod local_sched;
 /// thread local storage and the running task is owned by the
 /// scheduler.
 pub struct Scheduler {
-    priv task_queue: WorkQueue<~Task>,
+    priv work_queue: WorkQueue<~Task>,
     stack_pool: StackPool,
     /// The event loop used to drive the scheduler and perform I/O
     event_loop: ~EventLoopObject,
@@ -76,7 +76,7 @@ pub impl Scheduler {
 
         Scheduler {
             event_loop: event_loop,
-            task_queue: WorkQueue::new(),
+            work_queue: WorkQueue::new(),
             stack_pool: StackPool::new(),
             saved_context: Context::empty(),
             current_task: None,
@@ -106,7 +106,7 @@ pub impl Scheduler {
         }
 
         let sched = local_sched::take();
-        assert!(sched.task_queue.is_empty());
+        assert!(sched.work_queue.is_empty());
         return sched;
     }
 
@@ -116,7 +116,7 @@ pub impl Scheduler {
     /// to run it later. Always use this instead of pushing to the work queue
     /// directly.
     fn enqueue_task(&mut self, task: ~Task) {
-        self.task_queue.push_front(task);
+        self.work_queue.push_front(task);
         self.event_loop.callback(resume_task_from_queue);
 
         fn resume_task_from_queue() {
@@ -133,7 +133,7 @@ pub impl Scheduler {
         rtdebug!("looking in work queue for task to schedule");
 
         let mut this = self;
-        match this.task_queue.pop_front() {
+        match this.work_queue.pop_front() {
             Some(task) => {
                 rtdebug!("resuming task from work queue");
                 this.resume_task_immediately(task);