Skip to content

Commit ecf3635

Browse files
committed
---
yaml --- r: 140282 b: refs/heads/try2 c: 7e89a51 h: refs/heads/master v: v3
1 parent b8f615c commit ecf3635

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 325263fe221647b7d6ef6c3cc1efd0d1e7cf3a21
8+
refs/heads/try2: 7e89a514a5ce9aa427ca350a4ba62e63f3c89f95
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/run-pass/preempt.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
fn starve_main(alive: chan<int>) {
1515
debug!("signalling main");
16-
alive <| 1;
16+
alive.recv(1);
1717
debug!("starving main");
1818
let i: int = 0;
1919
loop { i += 1; }
@@ -22,10 +22,12 @@ fn starve_main(alive: chan<int>) {
2222
pub fn main() {
2323
let alive: port<int> = port();
2424
debug!("main started");
25-
let s: task = spawn starve_main(chan(alive));
25+
let s: task = do task::spawn {
26+
starve_main(chan(alive));
27+
};
2628
let i: int;
2729
debug!("main waiting for alive signal");
28-
alive |> i;
30+
alive.send(i);
2931
debug!("main got alive signal");
3032
while i < 50 { debug!("main iterated"); i += 1; }
3133
debug!("main completed");

0 commit comments

Comments
 (0)