---

yaml
---
r: 69491
b: refs/heads/auto
c: 9675cd3
h: refs/heads/master
i:
  69489: 7bdb46c
  69487: 230bb65
v: v3

Author: bblum

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 3f6b4c24ec2234a06632234eaf3014ae0e4adc66
+refs/heads/auto: 9675cd311a405bd5222597a69825733029a2a040
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/task/spawn.rs

@@ -512,7 +512,9 @@ impl RuntimeGlue {
     unsafe fn kill_all_tasks(task: &TaskHandle) {
         match *task {
             OldTask(ptr) => rt::rust_task_kill_all(ptr),
-            NewTask(ref _handle) => rtabort!("unimplemented"), // FIXME(#7544)
+            // FIXME(#7544): Remove the kill_all feature entirely once the
+            // oldsched goes away.
+            NewTask(ref _handle) => rtabort!("can't kill_all in newsched"),
         }
     }
 
@@ -573,7 +575,10 @@ impl RuntimeGlue {
                             members: members,
                             descendants: TaskSet::new(),
                         }));
-                        let group = Taskgroup(tasks, AncestorList(None), true, None);
+                        // FIXME(#7544): Remove the is_main flag entirely once
+                        // the newsched goes away. The main taskgroup has no special
+                        // behaviour.
+                        let group = Taskgroup(tasks, AncestorList(None), false, None);
                         (*me).taskgroup = Some(group);
                         (*me).taskgroup.get_ref()
                     }