Skip to content

Commit bb22ace

Browse files
committed
Removing do keyword from libgreen
1 parent badc580 commit bb22ace

File tree

4 files changed

+99
-101
lines changed

4 files changed

+99
-101
lines changed

src/libgreen/basic.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,18 +247,18 @@ mod test {
247247

248248
#[test]
249249
fn smoke() {
250-
do run {}
250+
run(proc() {});
251251
}
252252

253253
#[test]
254254
fn some_channels() {
255-
do run {
255+
run(proc() {
256256
let (p, c) = Chan::new();
257-
do spawn {
257+
spawn(proc() {
258258
c.send(());
259-
}
259+
});
260260
p.recv();
261-
}
261+
});
262262
}
263263

264264
#[test]
@@ -269,13 +269,13 @@ mod test {
269269
});
270270

271271
for _ in range(0, 20) {
272-
do pool.spawn(TaskOpts::new()) {
272+
pool.spawn(TaskOpts::new(), proc() {
273273
let (p, c) = Chan::new();
274-
do spawn {
274+
spawn(proc() {
275275
c.send(());
276-
}
276+
});
277277
p.recv();
278-
}
278+
});
279279
}
280280

281281
pool.shutdown();

src/libgreen/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ pub mod task;
6060
#[cfg(not(test))]
6161
pub fn lang_start(main: *u8, argc: int, argv: **u8) -> int {
6262
use std::cast;
63-
do start(argc, argv) {
63+
start(argc, argv, proc() {
6464
let main: extern "Rust" fn() = unsafe { cast::transmute(main) };
6565
main();
66-
}
66+
})
6767
}
6868

6969
/// Set up a default runtime configuration, given compiler-supplied arguments.
@@ -222,7 +222,7 @@ impl SchedPool {
222222
pool.task_state.clone());
223223
pool.handles.push(sched.make_handle());
224224
let sched = sched;
225-
pool.threads.push(do Thread::start { sched.bootstrap(); });
225+
pool.threads.push(Thread::start(proc() { sched.bootstrap(); }));
226226
}
227227

228228
return pool;
@@ -284,7 +284,7 @@ impl SchedPool {
284284
let ret = sched.make_handle();
285285
self.handles.push(sched.make_handle());
286286
let sched = sched;
287-
self.threads.push(do Thread::start { sched.bootstrap() });
287+
self.threads.push(Thread::start(proc() { sched.bootstrap() }));
288288

289289
return ret;
290290
}

0 commit comments

Comments
 (0)