bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cmp: remove duplicate free functions

Browse source
This commit is contained in:
Daniel Micay 2013-06-09 03:23:05 -04:00
parent 88c318d28c
commit 86833ea286
3 changed files with 23 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libextra/priority_queue.rs
View file

@ -186,13 +186,12 @@ impl<T:Ord> PriorityQueue<T> {
#[cfg(test)]
mod tests {
use sort::merge_sort;
use core::cmp::le;
use priority_queue::PriorityQueue;
#[test]
fn test_top_and_pop() {
let data = ~[2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
let mut sorted = merge_sort(data, le);
let data = ~[2u, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
let mut sorted = merge_sort(data, |x, y| x.le(y));
let mut heap = PriorityQueue::from_vec(data);
while !heap.is_empty() {
assert_eq!(heap.top(), sorted.last());
@ -274,8 +273,9 @@ mod tests {
fn check_to_vec(data: ~[int]) {
let heap = PriorityQueue::from_vec(copy data);
assert_eq!(merge_sort((copy heap).to_vec(), le), merge_sort(data, le));
assert_eq!(heap.to_sorted_vec(), merge_sort(data, le));
assert_eq!(merge_sort((copy heap).to_vec(), |x, y| x.le(y)),
merge_sort(data, |x, y| x.le(y)));
assert_eq!(heap.to_sorted_vec(), merge_sort(data, |x, y| x.le(y)));
}
#[test]