diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-12-19 23:03:11 +1100 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-12-21 09:35:18 +1100 |
| commit | 1b1e4caa79077d48c1bf56bf5bfa7bfc83fdf941 (patch) | |
| tree | 932fade0a40ca5fe22eca4c302adadae3df91b4a /src/libextra/priority_queue.rs | |
| parent | 48fedcb36ffdb4248c238a1bfa7a846e6e27cb68 (diff) | |
| download | rust-1b1e4caa79077d48c1bf56bf5bfa7bfc83fdf941.tar.gz rust-1b1e4caa79077d48c1bf56bf5bfa7bfc83fdf941.zip | |
std::vec: add a sugary .sort() method for plain Ord sorting.
This moves the custom sorting to `.sort_by`.
Diffstat (limited to 'src/libextra/priority_queue.rs')
| -rw-r--r-- | src/libextra/priority_queue.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs index d2cace5e6f4..3c1743cfe34 100644 --- a/src/libextra/priority_queue.rs +++ b/src/libextra/priority_queue.rs @@ -231,7 +231,11 @@ mod tests { fn test_top_and_pop() { let data = ~[2u, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1]; let mut sorted = data.clone(); +<<<<<<< HEAD sorted.sort(|x, y| x.le(y)); +======= + sorted.sort(); +>>>>>>> 9ceda35... std::vec: add a sugary .sort() method for plain Ord sorting. let mut heap = PriorityQueue::from_vec(data); while !heap.is_empty() { assert_eq!(heap.top(), sorted.last()); @@ -314,8 +318,8 @@ mod tests { fn check_to_vec(mut data: ~[int]) { let heap = PriorityQueue::from_vec(data.clone()); let mut v = heap.clone().to_vec(); - v.sort(|x, y| x.le(y)); - data.sort(|x, y| x.le(y)); + v.sort(); + data.sort(); assert_eq!(v, data); assert_eq!(heap.to_sorted_vec(), data); |
