Skip to content

Commit 37a9483

Browse files
author
Eric Holk
committed
---
yaml --- r: 4750 b: refs/heads/master c: fc616af h: refs/heads/master v: v3
1 parent 5b3b229 commit 37a9483

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 8686645aad315467c97f457e8330696d88a4f9a0
2+
refs/heads/master: fc616af8204b7ad50cd067205934017a7f0871d7

trunk/src/lib/task.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ native "rust" mod rustrt {
3232

3333
type rust_task = {
3434
mutable notify_enabled : u8,
35-
mutable notify_chan : _chan[task_notification]
35+
mutable notify_chan : _chan<task_notification>
3636
};
3737

3838
type task = int;
@@ -83,13 +83,13 @@ fn spawn(thunk : fn() -> ()) -> task {
8383
spawn_inner(thunk, none)
8484
}
8585

86-
fn spawn_notify(thunk : fn() -> (), notify : _chan[task_notification])
86+
fn spawn_notify(thunk : fn() -> (), notify : _chan<task_notification>)
8787
-> task {
8888
spawn_inner(thunk, some(notify))
8989
}
9090

9191
// FIXME: make this a fn~ once those are supported.
92-
fn spawn_inner(thunk : fn() -> (), notify : option[_chan[task_notification]])
92+
fn spawn_inner(thunk : fn() -> (), notify : option<_chan<task_notification>>)
9393
-> task_id {
9494
let id = rustrt::new_task();
9595

trunk/src/test/stdtest/task.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn test_lib_spawn2() {
4343
fn test_join_chan() {
4444
fn winner() { }
4545

46-
let p = comm::mk_port[task::task_notification]();
46+
let p = comm::mk_port::<task::task_notification>();
4747
task::spawn_notify(bind winner(), p.mk_chan());
4848
let s = p.recv();
4949
log_err "received task status message";
@@ -58,7 +58,7 @@ fn test_join_chan() {
5858
fn test_join_chan_fail() {
5959
fn failer() { task::unsupervise(); fail }
6060

61-
let p = comm::mk_port[task::task_notification]();
61+
let p = comm::mk_port::<task::task_notification>();
6262
task::spawn_notify(bind failer(), p.mk_chan());
6363
let s = p.recv();
6464
log_err "received task status message";

0 commit comments

Comments
 (0)