---

yaml
---
r: 36763
b: refs/heads/try2
c: 757a2af
h: refs/heads/master
i:
  36761: 8ed6e61
  36759: 652ad5c
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: dd2b32be56945824e1e900d9748274633d6db6c1
+refs/heads/try2: 757a2afb6b80cb4dbdcb8069f1af511ec42e8670
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/priority_queue.rs

@@ -76,6 +76,21 @@ impl <T: Copy Ord> PriorityQueue<T> {
         ret
     }
 
+    /// Consume the PriorityQueue and return the underlying vector
+    pure fn to_vec(self) -> ~[T] { let PriorityQueue{data: v} = self; v }
+
+    /// Consume the PriorityQueue and return a vector in sorted (ascending) order
+    pure fn to_sorted_vec(self) -> ~[T] {
+        let mut q = self;
+        let mut end = q.len() - 1;
+        while end > 0 {
+            q.data[end] <-> q.data[0];
+            end -= 1;
+            unsafe { q.siftup_range(0, end) } // purity-checking workaround
+        }
+        q.to_vec()
+    }
+
     priv fn siftdown(&mut self, startpos: uint, pos: uint) {
         let mut pos = pos;
         let newitem = self.data[pos];
@@ -118,24 +133,6 @@ impl <T: Copy Ord> PriorityQueue<T> {
     }
 }
 
-/// Consume the PriorityQueue and return the underlying vector
-pub pure fn to_vec<T: Copy Ord>(q: PriorityQueue<T>) -> ~[T] {
-    let PriorityQueue{data: v} = q;
-    v
-}
-
-/// Consume the PriorityQueue and return a vector in sorted (ascending) order
-pub pure fn to_sorted_vec<T: Copy Ord>(q: PriorityQueue<T>) -> ~[T] {
-    let mut q = q;
-    let mut end = q.len() - 1;
-    while end > 0 {
-        q.data[end] <-> q.data[0];
-        end -= 1;
-        unsafe { q.siftup_range(0, end) } // purity-checking workaround
-    }
-    to_vec(q)
-}
-
 pub pure fn from_vec<T: Copy Ord>(xs: ~[T]) -> PriorityQueue<T> {
     let mut q = PriorityQueue{data: xs,};
     let mut n = q.len() / 2;
@@ -215,7 +212,7 @@ mod tests {
     #[test]
     fn test_to_sorted_vec() {
         let data = ~[2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
-        assert to_sorted_vec(from_vec(data)) == merge_sort(data, le);
+        assert from_vec(data).to_sorted_vec() == merge_sort(data, le);
     }
 
     #[test]
@@ -248,6 +245,6 @@ mod tests {
     fn test_to_vec() {
         let data = ~[1, 3, 5, 7, 9, 2, 4, 6, 8, 0];
         let heap = from_vec(copy data);
-        assert merge_sort(to_vec(heap), le) == merge_sort(data, le);
+        assert merge_sort(heap.to_vec(), le) == merge_sort(data, le);
     }
 }