bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

core: missed rebase cruft cleanup

Browse source
This commit is contained in:
Jeff Olson 2012-09-07 15:58:45 -07:00 • committed by Brian Anderson
parent 3e58158375
commit 12439b0b24
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcore/task.rs
View file

@ -1037,11 +1037,7 @@ fn each_ancestor(list: &mut AncestorList,
struct TCB { struct TCB {
me: *rust_task, me: *rust_task,
// List of tasks with whose fates this one's is intertwined. // List of tasks with whose fates this one's is intertwined.
<<<<<<< HEAD
tasks: TaskGroupArc, // 'none' means the group has failed. 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. // Lists of tasks who will kill us if they fail, but whom we won't kill.
mut ancestors: AncestorList, mut ancestors: AncestorList,
is_main: bool, is_main: bool,