---

yaml
---
r: 36783
b: refs/heads/try2
c: f1e8773
h: refs/heads/master
i:
  36781: d916b43
  36779: 277e8c0
  36775: df43a1a
  36767: 0edcaeb
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: 02e804bba8e2e82e6e2112ceb297ffb237b42ea6
+refs/heads/try2: f1e87733bd4b669f2dcfe758a7ae2b1ddea60715
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/priority_queue.rs

@@ -105,8 +105,11 @@ impl <T: Ord> PriorityQueue<T> {
         q.to_vec()
     }
 
+    /// Create an empty PriorityQueue
+    static pure fn new() -> PriorityQueue<T> { PriorityQueue{data: ~[],} }
+
     /// Create a PriorityQueue from a vector (heapify)
-    static pub pure fn from_vec(xs: ~[T]) -> PriorityQueue<T> {
+    static pure fn from_vec(xs: ~[T]) -> PriorityQueue<T> {
         let mut q = PriorityQueue{data: xs,};
         let mut n = q.len() / 2;
         while n > 0 {
@@ -168,7 +171,7 @@ impl <T: Ord> PriorityQueue<T> {
 mod tests {
     use sort::merge_sort;
     use core::cmp::le;
-    use priority_queue::PriorityQueue::from_vec;
+    use priority_queue::PriorityQueue::{from_vec, new};
 
     #[test]
     fn test_top_and_pop() {
@@ -279,30 +282,27 @@ mod tests {
     #[test]
     #[should_fail]
     #[ignore(cfg(windows))]
-    fn test_empty_pop() { let mut heap = from_vec::<int>(~[]); heap.pop(); }
+    fn test_empty_pop() { let mut heap = new::<int>(); heap.pop(); }
 
     #[test]
     fn test_empty_maybe_pop() {
-        let mut heap = from_vec::<int>(~[]);
+        let mut heap = new::<int>();
         assert heap.maybe_pop().is_none();
     }
 
     #[test]
     #[should_fail]
     #[ignore(cfg(windows))]
-    fn test_empty_top() { let empty = from_vec::<int>(~[]); empty.top(); }
+    fn test_empty_top() { let empty = new::<int>(); empty.top(); }
 
     #[test]
     fn test_empty_maybe_top() {
-        let empty = from_vec::<int>(~[]);
+        let empty = new::<int>();
         assert empty.maybe_top().is_none();
     }
 
     #[test]
     #[should_fail]
     #[ignore(cfg(windows))]
-    fn test_empty_replace() {
-        let mut heap = from_vec::<int>(~[]);
-        heap.replace(5);
-    }
+    fn test_empty_replace() { let mut heap = new(); heap.replace(5); }
 }