---

bblum · bblum · commit 7773c80f7205 · 2013-08-01T16:52:37.000-04:00
yaml --- r: 64954 b: refs/heads/snap-stage3 c: aeaed77 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 036a6d2f0080abd10521f7999af7100e5bcaaffe
+refs/heads/snap-stage3: aeaed77301397c6ab0c4f5413dbd4b7f0d5b5c9a
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libstd/rt/comm.rs b/branches/snap-stage3/src/libstd/rt/comm.rs
@@ -375,9 +375,7 @@ impl<T> Drop for PortOne<T> {
                     // receiver was killed awake. The task can't still be
                     // blocked (we are it), but we need to free the handle.
                     let recvr = BlockedTask::cast_from_uint(task_as_state);
-                    // FIXME(#7554)(bblum): Make this cfg(test) dependent.
-                    // in a later commit.
-                    assert!(recvr.wake().is_none());
+                    recvr.assert_already_awake();
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -375,9 +375,7 @@ impl<T> Drop for PortOne<T> {`
`375`	`375`	`// receiver was killed awake. The task can't still be`
`376`	`376`	`// blocked (we are it), but we need to free the handle.`
`377`	`377`	`let recvr = BlockedTask::cast_from_uint(task_as_state);`
`378`		`- // FIXME(#7554)(bblum): Make this cfg(test) dependent.`
`379`		`- // in a later commit.`
`380`		`- assert!(recvr.wake().is_none());`
	`378`	`+ recvr.assert_already_awake();`
`381`	`379`	`}`
`382`	`380`	`}`
`383`	`381`	`}`