about summary refs log tree commit diff
path: root/src/libextra/priority_queue.rs
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2013-06-09 03:23:05 -0400
committerDaniel Micay <danielmicay@gmail.com>2013-06-09 20:47:40 -0400
commit86833ea28616fd7bb6d16582aea7996549b4b873 (patch)
tree2fa4a352410444caa4fc63cca3f75a9600264e55 /src/libextra/priority_queue.rs
parent88c318d28c7d8fe8346d38d73cb0b1a30f33f278 (diff)
downloadrust-86833ea28616fd7bb6d16582aea7996549b4b873.tar.gz
rust-86833ea28616fd7bb6d16582aea7996549b4b873.zip
cmp: remove duplicate free functions
Diffstat (limited to 'src/libextra/priority_queue.rs')
-rw-r--r--src/libextra/priority_queue.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs
index b58f90beb31..601b7685f3c 100644
--- a/src/libextra/priority_queue.rs
+++ b/src/libextra/priority_queue.rs
@@ -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]