bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #14900 : alexcrichton/rust/snapshots, r=huonw

Browse source 
Closes #14898
Closes #14918
This commit is contained in:
bors 2014-06-16 08:16:49 +00:00
commit 7ec78053ec
94 changed files with 321 additions and 841 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libnative/io/timer_unix.rs
View file

@ -67,7 +67,7 @@ pub struct Timer {
}
struct Inner {
cb: Option<Box<rtio::Callback:Send>>,
cb: Option<Box<rtio::Callback + Send>>,
interval: u64,
repeat: bool,
target: u64,
@ -266,7 +266,7 @@ impl rtio::RtioTimer for Timer {
Timer::sleep(msecs);
}
fn oneshot(&mut self, msecs: u64, cb: Box<rtio::Callback:Send>) {
fn oneshot(&mut self, msecs: u64, cb: Box<rtio::Callback + Send>) {
let now = now();
let mut inner = self.inner();
@ -278,7 +278,7 @@ impl rtio::RtioTimer for Timer {
unsafe { HELPER.send(NewTimer(inner)); }
}
fn period(&mut self, msecs: u64, cb: Box<rtio::Callback:Send>) {
fn period(&mut self, msecs: u64, cb: Box<rtio::Callback + Send>) {
let now = now();
let mut inner = self.inner();