Skip to content

Commit 4f9f1e4

Browse files
committed
(cleanup) Fix unimplemented message for kill_all in newsched.
1 parent 3c938d1 commit 4f9f1e4

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/libstd/task/spawn.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,9 @@ impl RuntimeGlue {
512512
unsafe fn kill_all_tasks(task: &TaskHandle) {
513513
match *task {
514514
OldTask(ptr) => rt::rust_task_kill_all(ptr),
515-
NewTask(ref _handle) => rtabort!("unimplemented"), // FIXME(#7544)
515+
// FIXME(#7544): Remove the kill_all feature entirely once the
516+
// oldsched goes away.
517+
NewTask(ref _handle) => rtabort!("can't kill_all in newsched"),
516518
}
517519
}
518520

@@ -573,7 +575,10 @@ impl RuntimeGlue {
573575
members: members,
574576
descendants: TaskSet::new(),
575577
}));
576-
let group = Taskgroup(tasks, AncestorList(None), true, None);
578+
// FIXME(#7544): Remove the is_main flag entirely once
579+
// the newsched goes away. The main taskgroup has no special
580+
// behaviour.
581+
let group = Taskgroup(tasks, AncestorList(None), false, None);
577582
(*me).taskgroup = Some(group);
578583
(*me).taskgroup.get_ref()
579584
}

0 commit comments

Comments
 (0)