diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-07-10 14:43:25 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-07-17 14:57:53 -0700 |
| commit | e20549ff192edec9d625f1119bcb077c3abaf070 (patch) | |
| tree | 9cf88e584f36dc0d7f9f29a2fae55f0203bbc39c /src/test/bench | |
| parent | 99d44d24c7744361b352499b5f54b8f0bab876ec (diff) | |
| download | rust-e20549ff192edec9d625f1119bcb077c3abaf070.tar.gz rust-e20549ff192edec9d625f1119bcb077c3abaf070.zip | |
librustc: Remove all uses of the `Copy` bound.
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/shootout-k-nucleotide-pipes.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 64cfa2561a4..86ab99407b9 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -34,8 +34,8 @@ fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str { return (xx as float) * 100f / (yy as float); } - fn le_by_val<TT:Copy + Clone, - UU:Copy + Clone + Ord>( + fn le_by_val<TT:Clone, + UU:Clone + Ord>( kv0: &(TT,UU), kv1: &(TT,UU)) -> bool { @@ -44,8 +44,8 @@ fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str { return v0 >= v1; } - fn le_by_key<TT:Copy + Clone + Ord, - UU:Copy + Clone>( + fn le_by_key<TT:Clone + Ord, + UU:Clone>( kv0: &(TT,UU), kv1: &(TT,UU)) -> bool { @@ -55,10 +55,7 @@ fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str { } // sort by key, then by value - fn sortKV<TT:Copy + Clone + Ord, - UU:Copy + Clone + Ord>( - orig: ~[(TT,UU)]) - -> ~[(TT,UU)] { + fn sortKV<TT:Clone + Ord, UU:Clone + Ord>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { return sort::merge_sort(sort::merge_sort(orig, le_by_key), le_by_val); } |
