---

yaml
---
r: 140999
b: refs/heads/try2
c: 7f5746f
h: refs/heads/master
i:
  140997: 2b5ed23
  140995: 38385c6
  140991: 513686d
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 56c0b188b66f71f55e2d577ca4a23830a31433e6
+refs/heads/try2: 7f5746f6d2bcc048aca5ddfbfdf41497ab874836
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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);