Skip to content

Commit bdace24

Browse files
committed
---
yaml --- r: 57869 b: refs/heads/incoming c: e9814da h: refs/heads/master i: 57867: b83a0a7 v: v3
1 parent 62d6880 commit bdace24

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 212d77efcc2724cde74de3297b8d259675ce7bab
9+
refs/heads/incoming: e9814da3c0959247a79cffca8af3f07d124a8e49
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/run-pass/infinite-loops.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
// xfail-test
1616

1717
extern mod std;
18-
use task::join;
19-
20-
fn loop(n: int) {
21-
let t1: task;
22-
let t2: task;
23-
24-
if n > 0 { t1 = spawn loop(n - 1); t2 = spawn loop(n - 1); }
25-
2618

19+
fn loopy(n: int) {
20+
if n > 0 { do spawn { loopy(n - 1) }; do spawn { loopy(n - 1) }; }
2721
loop { }
2822
}
2923

30-
pub fn main() { let t: task = spawn loop(5); join(t); }
24+
pub fn main() {
25+
// Commenting this out, as this will hang forever otherwise.
26+
// Even after seeing the comment above, I'm not sure what the
27+
// intention of this test is.
28+
// do spawn { loopy(5) };
29+
}

0 commit comments

Comments
 (0)