---

yaml
---
r: 30456
b: refs/heads/incoming
c: 10aa849
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 7e9f98a8c95588b7c88e5d4b4db1890e086257ee
+refs/heads/incoming: 10aa849d28d74c2c332f24a0da55833c95d91ab1
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -8,29 +8,30 @@ use std::map::hashmap;
 use std::sort;
 use io::ReaderUtil;
 use pipes::{stream, Port, Chan};
+use cmp::Ord;
 
 // given a map, print a sorted version of it
 fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { 
    fn pct(xx: uint, yy: uint) -> float {
       return (xx as float) * 100f / (yy as float);
    }
 
-   pure fn le_by_val<TT: Copy, UU: Copy>(kv0: &(TT,UU),
+   pure fn le_by_val<TT: Copy, UU: Copy Ord>(kv0: &(TT,UU),
                                          kv1: &(TT,UU)) -> bool {
       let (_, v0) = *kv0;
       let (_, v1) = *kv1;
       return v0 >= v1;
    }
 
-   pure fn le_by_key<TT: Copy, UU: Copy>(kv0: &(TT,UU),
+   pure fn le_by_key<TT: Copy Ord, UU: Copy>(kv0: &(TT,UU),
                                          kv1: &(TT,UU)) -> bool {
       let (k0, _) = *kv0;
       let (k1, _) = *kv1;
       return k0 <= k1;
    }
 
    // sort by key, then by value
-   fn sortKV<TT: Copy, UU: Copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] {
+   fn sortKV<TT: Copy Ord, UU: Copy Ord>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] {
       return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig));
    }
 

branches/incoming/src/test/bench/shootout-k-nucleotide.rs

@@ -7,6 +7,7 @@ use std::map;
 use std::map::hashmap;
 use std::sort;
 use io::ReaderUtil;
+use cmp::Ord;
 
 // given a map, print a sorted version of it
 fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str {