---

yaml
---
r: 36765
b: refs/heads/try2
c: 8b13bf7
h: refs/heads/master
i:
  36763: 749a70a
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 285496bd550817094c31167e7e49378a35560842
+refs/heads/try2: 8b13bf75306d7b5645531a0eb273b9ce9805e009
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/priority_queue.rs

@@ -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