diff options
| author | bors <bors@rust-lang.org> | 2013-11-26 12:13:03 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-26 12:13:03 -0800 |
| commit | e9a1869a5f4164d5311963b1b25b05f003d43699 (patch) | |
| tree | 1c47dcc76668490e9b0228e2a10c27cfebbb80cf /src/libstd/rt/basic.rs | |
| parent | 9f9efae790bba41f08befc2af47ef235b03dd8a9 (diff) | |
| parent | 9521551b4710805674ad6c1755bef4e76784db02 (diff) | |
| download | rust-e9a1869a5f4164d5311963b1b25b05f003d43699.tar.gz rust-e9a1869a5f4164d5311963b1b25b05f003d43699.zip | |
auto merge of #10581 : pcwalton/rust/dedo, r=pcwalton
r? @alexcrichton
Diffstat (limited to 'src/libstd/rt/basic.rs')
| -rw-r--r-- | src/libstd/rt/basic.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/rt/basic.rs b/src/libstd/rt/basic.rs index 2c1c5d84be1..d857f39ceaf 100644 --- a/src/libstd/rt/basic.rs +++ b/src/libstd/rt/basic.rs @@ -71,13 +71,13 @@ impl BasicLoop { fn remote_work(&mut self) { let messages = unsafe { - do self.messages.with |messages| { + self.messages.with(|messages| { if messages.len() > 0 { Some(util::replace(messages, ~[])) } else { None } - } + }) }; let messages = match messages { Some(m) => m, None => return @@ -139,11 +139,11 @@ impl EventLoop for BasicLoop { unsafe { // We block here if we have no messages to process and we may // receive a message at a later date - do self.messages.hold_and_wait |messages| { + self.messages.hold_and_wait(|messages| { self.remotes.len() > 0 && messages.len() == 0 && self.work.len() == 0 - } + }) } } } @@ -189,9 +189,9 @@ impl BasicRemote { impl RemoteCallback for BasicRemote { fn fire(&mut self) { unsafe { - do self.queue.hold_and_signal |queue| { + self.queue.hold_and_signal(|queue| { queue.push(RunRemote(self.id)); - } + }) } } } @@ -199,9 +199,9 @@ impl RemoteCallback for BasicRemote { impl Drop for BasicRemote { fn drop(&mut self) { unsafe { - do self.queue.hold_and_signal |queue| { + self.queue.hold_and_signal(|queue| { queue.push(RemoveRemote(self.id)); - } + }) } } } |
