squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Updating to new type parameter syntax.

Browse source
This commit is contained in:
Eric Holk 2011-08-16 16:52:52 -07:00
parent 8686645aad
commit fc616af820
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/task.rs
View file

@ -32,7 +32,7 @@ native "rust" mod rustrt {
type rust_task = { type rust_task = {
mutable notify_enabled : u8, mutable notify_enabled : u8,
mutable notify_chan : _chan[task_notification] mutable notify_chan : _chan<task_notification>
}; };
type task = int; type task = int;
@ -83,13 +83,13 @@ fn spawn(thunk : fn() -> ()) -> task {
spawn_inner(thunk, none) spawn_inner(thunk, none)
} }
fn spawn_notify(thunk : fn() -> (), notify : _chan[task_notification]) fn spawn_notify(thunk : fn() -> (), notify : _chan<task_notification>)
-> task { -> task {
spawn_inner(thunk, some(notify)) spawn_inner(thunk, some(notify))
} }
// FIXME: make this a fn~ once those are supported. // FIXME: make this a fn~ once those are supported.
fn spawn_inner(thunk : fn() -> (), notify : option[_chan[task_notification]]) fn spawn_inner(thunk : fn() -> (), notify : option<_chan<task_notification>>)
-> task_id { -> task_id {
let id = rustrt::new_task(); let id = rustrt::new_task();

4
src/test/stdtest/task.rs
View file

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