Skip to content

Commit 412928d

Browse files
committed
---
yaml --- r: 36773 b: refs/heads/try2 c: 90bebe3 h: refs/heads/master i: 36771: 17a37d9 v: v3
1 parent 5a8fc4d commit 412928d

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: ac695aa21a93dc7b82d817a69c8c1918bb4d9b31
8+
refs/heads/try2: 90bebe35224c6dc0238e3a35726bcd5fb0088337
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/priority_queue.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,19 @@ impl <T: Ord> PriorityQueue<T> {
7979
}
8080

8181
/// Consume the PriorityQueue and return the underlying vector
82+
#[cfg(stage0)]
83+
pure fn to_vec(self) -> ~[T] { fail }
84+
#[cfg(stage1)]
85+
#[cfg(stage2)]
86+
#[cfg(stage3)]
8287
pure fn to_vec(self) -> ~[T] { let PriorityQueue{data: v} = self; v }
8388

8489
/// Consume the PriorityQueue and return a vector in sorted (ascending) order
90+
#[cfg(stage0)]
91+
pure fn to_sorted_vec(self) -> ~[T] { fail }
92+
#[cfg(stage1)]
93+
#[cfg(stage2)]
94+
#[cfg(stage3)]
8595
pure fn to_sorted_vec(self) -> ~[T] {
8696
let mut q = self;
8797
let mut end = q.len();
@@ -244,6 +254,7 @@ mod tests {
244254

245255
#[test]
246256
#[should_fail]
257+
#[ignore(cfg(windows))]
247258
fn test_empty_pop() { let mut heap = from_vec::<int>(~[]); heap.pop(); }
248259

249260
#[test]
@@ -254,6 +265,7 @@ mod tests {
254265

255266
#[test]
256267
#[should_fail]
268+
#[ignore(cfg(windows))]
257269
fn test_empty_top() { let empty = from_vec::<int>(~[]); empty.top(); }
258270

259271
#[test]
@@ -264,6 +276,7 @@ mod tests {
264276

265277
#[test]
266278
#[should_fail]
279+
#[ignore(cfg(windows))]
267280
fn test_empty_replace() {
268281
let mut heap = from_vec::<int>(~[]);
269282
heap.replace(5);

0 commit comments

Comments
 (0)