---

yaml
---
r: 143919
b: refs/heads/try2
c: 5ac8c57
h: refs/heads/master
i:
  143917: 2d96b02
  143915: 437b4f4
  143911: 17500d8
  143903: f557c9e
v: v3

Author: bblum

[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: ce48e71d28a69151a9f1fb7a620dcbad2834cef3
+refs/heads/try2: 5ac8c57bd420d61ed80a07746ab1a75e4062383f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/kill.rs

@@ -488,8 +488,8 @@ impl Death {
         rtassert!(self.unkillable == 0);
         self.unkillable = 1;
 
-        // FIXME(#7544): See corresponding fixme at the callsite in task.rs.
-        // NB(#8192): Doesn't work with "let _ = ..."
+        // NB. See corresponding comment at the callsite in task.rs.
+        // FIXME(#8192): Doesn't work with "let _ = ..."
         { use util; util::ignore(group); }
 
         // Step 1. Decide if we need to collect child failures synchronously.

branches/try2/src/libstd/rt/task.rs

@@ -253,12 +253,10 @@ impl Task {
             }
         }
 
-        // FIXME(#7544): We pass the taskgroup into death so that it can be
-        // dropped while the unkillable counter is set. This should not be
-        // necessary except for an extraneous clone() in task/spawn.rs that
-        // causes a killhandle to get dropped, which mustn't receive a kill
-        // signal since we're outside of the unwinder's try() scope.
-        // { let _ = self.taskgroup.take(); }
+        // NB. We pass the taskgroup into death so that it can be dropped while
+        // the unkillable counter is set. This is necessary for when the
+        // taskgroup destruction code drops references on KillHandles, which
+        // might require using unkillable (to synchronize with an unwrapper).
         self.death.collect_failure(!self.unwinder.unwinding, self.taskgroup.take());
         self.destroyed = true;
     }

branches/try2/src/libstd/task/mod.rs

@@ -38,7 +38,6 @@
 use prelude::*;
 
 use cell::Cell;
-use cmp::Eq;
 use comm::{stream, Chan, GenericChan, GenericPort, Port};
 use result::Result;
 use result;