OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

priority_queue: replace some copies with swaps

This commit is contained in:
Daniel Micay 2012-12-11 09:47:36 -05:00 committed by Brian Anderson
parent 285496bd55
commit 8b13bf7530
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/priority_queue.rs
View File

@ -38,13 +38,9 @@ impl <T: Copy Ord> PriorityQueue<T> {
/// Pop the greatest item from the queue - fails if empty
fn pop(&mut self) -> T {
let last = self.data.pop();
if self.is_not_empty() {
let ret = self.data[0];
self.data[0] = last;
self.siftup(0);
ret
} else { last }
let mut item = self.data.pop();
if self.is_not_empty() { item <-> self.data[0]; self.siftup(0); }
item
}
/// Pop the greatest item from the queue - None if empty
@ -70,10 +66,10 @@ impl <T: Copy Ord> PriorityQueue<T> {
/// Optimized version of a pop followed by a push - fails if empty
fn replace(&mut self, item: T) -> T {
let ret = self.data[0];
self.data[0] = item;
let mut item = item;
item <-> self.data[0];
self.siftup(0);
ret
item
}
/// Consume the PriorityQueue and return the underlying vector