diff options
| author | Jeff Olson <olson.jeffery@gmail.com> | 2012-09-07 15:58:45 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-08 14:22:16 -0700 |
| commit | 12439b0b2480bc4186a972d8a9e7b5b4c1ece42f (patch) | |
| tree | 703a85e2988e355027f0a4529bd393f20837ea0f | |
| parent | 3e5815837594c3fdf2a67bc735a4b3de4009c798 (diff) | |
| download | rust-12439b0b2480bc4186a972d8a9e7b5b4c1ece42f.tar.gz rust-12439b0b2480bc4186a972d8a9e7b5b4c1ece42f.zip | |
core: missed rebase cruft cleanup
| -rw-r--r-- | src/libcore/task.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libcore/task.rs b/src/libcore/task.rs index 3bdfe152aec..bee810fceba 100644 --- a/src/libcore/task.rs +++ b/src/libcore/task.rs @@ -1037,11 +1037,7 @@ fn each_ancestor(list: &mut AncestorList, struct TCB { me: *rust_task, // List of tasks with whose fates this one's is intertwined. -<<<<<<< HEAD tasks: TaskGroupArc, // 'none' means the group has failed. -======= - let tasks: TaskGroupArc; // 'None' means the group has failed. ->>>>>>> core: port task.rs to comm::Chan/Port to pipes::Chan/Port // Lists of tasks who will kill us if they fail, but whom we won't kill. mut ancestors: AncestorList, is_main: bool, |