Skip to content

Commit 13b302d

Browse files
committed
---
yaml --- r: 39213 b: refs/heads/incoming c: 7a065f2 h: refs/heads/master i: 39211: e0f665a v: v3
1 parent 4a6daa4 commit 13b302d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 1282fc80740b5c462a094c45f65cb1ce0c1d7756
9+
refs/heads/incoming: 7a065f243473ea4ea8dc4653bca33f04a1381122
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ fn test_spawn_linked_sup_fail_up() { // child fails; parent fails
785785
let b1 = TaskBuilder {
786786
opts: move opts,
787787
can_not_copy: None,
788-
.. *b0
788+
.. b0
789789
};
790790
do b1.spawn { fail; }
791791
comm::recv(po); // We should get punted awake
@@ -805,7 +805,7 @@ fn test_spawn_linked_sup_fail_down() { // parent fails; child fails
805805
let b1 = TaskBuilder {
806806
opts: move opts,
807807
can_not_copy: None,
808-
.. *b0
808+
.. b0
809809
};
810810
do b1.spawn { loop { task::yield(); } }
811811
fail; // *both* mechanisms would be wrong if this didn't kill the child...

0 commit comments

Comments
 (0)