---

yaml
---
r: 36764
b: refs/heads/try2
c: 285496b
h: refs/heads/master
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: 757a2afb6b80cb4dbdcb8069f1af511ec42e8670
+refs/heads/try2: 285496bd550817094c31167e7e49378a35560842
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/priority_queue.rs

@@ -91,6 +91,16 @@ impl <T: Copy Ord> PriorityQueue<T> {
         q.to_vec()
     }
 
+    static pub pure fn from_vec(xs: ~[T]) -> PriorityQueue<T> {
+        let mut q = PriorityQueue{data: xs,};
+        let mut n = q.len() / 2;
+        while n > 0 {
+            n -= 1;
+            unsafe { q.siftup(n) }; // purity-checking workaround
+        }
+        q
+    }
+
     priv fn siftdown(&mut self, startpos: uint, pos: uint) {
         let mut pos = pos;
         let newitem = self.data[pos];
@@ -133,20 +143,11 @@ impl <T: Copy Ord> PriorityQueue<T> {
     }
 }
 
-pub pure fn from_vec<T: Copy Ord>(xs: ~[T]) -> PriorityQueue<T> {
-    let mut q = PriorityQueue{data: xs,};
-    let mut n = q.len() / 2;
-    while n > 0 {
-        n -= 1;
-        unsafe { q.siftup(n) }; // purity-checking workaround
-    }
-    q
-}
-
 #[cfg(test)]
 mod tests {
     use sort::merge_sort;
     use core::cmp::le;
+    use PriorityQueue::from_vec;
 
     #[test]
     fn test_top_and_pop() {