---

yaml
---
r: 42635
b: refs/heads/try
c: e43cff6
h: refs/heads/master
i:
  42633: 0bfc506
  42631: 637b412
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 86b8bf37bbd5c83953933c9c38a20567843c3a7f
+refs/heads/try: e43cff6657b5ba4245480ede5230e3f00aa52185
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libstd/priority_queue.rs

@@ -47,9 +47,6 @@ impl <T: Ord> PriorityQueue<T> {
         if self.is_empty() { None } else { Some(self.top()) }
     }
 
-    /// Returns true if a queue contains some elements
-    pure fn is_not_empty(&self) -> bool { self.data.is_not_empty() }
-
     /// Returns the number of elements the queue can hold without reallocating
     pure fn capacity(&self) -> uint { vec::capacity(&self.data) }
 
@@ -62,7 +59,7 @@ impl <T: Ord> PriorityQueue<T> {
     /// Pop the greatest item from the queue - fails if empty
     fn pop(&mut self) -> T {
         let mut item = self.data.pop();
-        if self.is_not_empty() { item <-> self.data[0]; self.siftdown(0); }
+        if !self.is_empty() { item <-> self.data[0]; self.siftdown(0); }
         item
     }
 
@@ -80,7 +77,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;
-        if self.is_not_empty() && self.data[0] > item {
+        if !self.is_empty() && self.data[0] > item {
             item <-> self.data[0];
             self.siftdown(0);
         }
@@ -189,7 +186,7 @@ mod tests {
         let data = ~[2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
         let mut sorted = merge_sort(data, le);
         let mut heap = from_vec(data);
-        while heap.is_not_empty() {
+        while !heap.is_empty() {
             assert *heap.top() == sorted.last();
             assert heap.pop() == sorted.pop();
         }