bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20061: aturon/stab-2-vec-slice

Browse source 
Conflicts:
	src/libcollections/slice.rs
	src/libcollections/vec.rs
	src/libstd/sys/windows/os.rs
This commit is contained in:
Alex Crichton 2014-12-30 18:51:51 -08:00
commit 67d13883f8
80 changed files with 2525 additions and 2524 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstd/sys/unix/timer.rs
View file

@ -120,9 +120,9 @@ fn helper(input: libc::c_int, messages: Receiver<Req>, _: ()) {
// signals the first requests in the queue, possible re-enqueueing it.
fn signal(active: &mut Vec<Box<Inner>>,
dead: &mut Vec<(uint, Box<Inner>)>) {
let mut timer = match active.remove(0) {
Some(timer) => timer, None => return
};
if active.is_empty() { return }
let mut timer = active.remove(0);
let mut cb = timer.cb.take().unwrap();
cb.call();
if timer.repeat {
@ -185,7 +185,7 @@ fn helper(input: libc::c_int, messages: Receiver<Req>, _: ()) {
Ok(RemoveTimer(id, ack)) => {
match dead.iter().position(|&(i, _)| id == i) {
Some(i) => {
let (_, i) = dead.remove(i).unwrap();
let (_, i) = dead.remove(i);
ack.send(i);
continue
}
@ -193,7 +193,7 @@ fn helper(input: libc::c_int, messages: Receiver<Req>, _: ()) {
}
let i = active.iter().position(|i| i.id == id);
let i = i.expect("no timer found");
let t = active.remove(i).unwrap();
let t = active.remove(i);
ack.send(t);
}
Err(..) => break