rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Revert "Merge pull request #4633 from thestinger/treemap""

Browse Source 
This reverts commit d73077f82d.
This commit is contained in:
Tim Chevalier
2013-01-28 14:11:45 -08:00
parent ab0b7b2784
commit 3a6849f36b
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstd/priority_queue.rs
View File

@@ -76,8 +76,7 @@ impl <T: Ord> PriorityQueue<T> {
}
/// Optimized version of a push followed by a pop
fn push_pop(&mut self, item: T) -> T {
let mut item = item;
fn push_pop(&mut self, mut item: T) -> T {
if !self.is_empty() && self.data[0] > item {
item <-> self.data[0];
self.siftdown(0);
@@ -86,8 +85,7 @@ impl <T: Ord> PriorityQueue<T> {
}
/// Optimized version of a pop followed by a push - fails if empty
fn replace(&mut self, item: T) -> T {
let mut item = item;
fn replace(&mut self, mut item: T) -> T {
item <-> self.data[0];
self.siftdown(0);
item
@@ -129,9 +127,8 @@ impl <T: Ord> PriorityQueue<T> {
// vector over the junk element. This reduces the constant factor
// compared to using swaps, which involves twice as many moves.
priv fn siftup(&mut self, start: uint, pos: uint) {
priv fn siftup(&mut self, start: uint, mut pos: uint) {
unsafe {
let mut pos = pos;
let new = move *addr_of(&self.data[pos]);
while pos > start {
@@ -149,9 +146,8 @@ impl <T: Ord> PriorityQueue<T> {
}
}
priv fn siftdown_range(&mut self, pos: uint, end: uint) {
priv fn siftdown_range(&mut self, mut pos: uint, end: uint) {
unsafe {
let mut pos = pos;
let start = pos;
let new = move *addr_of(&self.data[pos]);