Skip to content

(fix incoming) Add the necessary traits to some generic functions #3426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2012
Merged

(fix incoming) Add the necessary traits to some generic functions #3426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/test/bench/task-perf-word-count-generic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use option::Some;
use option::None;
use std::map;
use std::map::hashmap;
use hash::Hash;
use io::WriterUtil;

use std::time;
Expand All @@ -25,6 +26,8 @@ use comm::Chan;
use comm::Port;
use comm::recv;
use comm::send;
use cmp::Eq;
use to_bytes::IterBytes;

macro_rules! move_out (
{ $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }
Expand Down Expand Up @@ -145,7 +148,7 @@ mod map_reduce {

enum reduce_proto<V: Copy Send> { emit_val(V), done, addref, release }

fn start_mappers<K1: Copy Send, K2: Const Copy Send hash_key,
fn start_mappers<K1: Copy Send, K2: Hash IterBytes Eq Const Copy Send hash_key,
V: Copy Send>(
map: mapper<K1, K2, V>,
&ctrls: ~[ctrl_proto::server::open<K2, V>],
Expand All @@ -162,7 +165,7 @@ mod map_reduce {
return tasks;
}

fn map_task<K1: Copy Send, K2: Const Copy Send hash_key, V: Copy Send>(
fn map_task<K1: Copy Send, K2: Hash IterBytes Eq Const Copy Send hash_key, V: Copy Send>(
map: mapper<K1, K2, V>,
ctrl: box<ctrl_proto::client::open<K2, V>>,
input: K1)
Expand Down Expand Up @@ -235,7 +238,7 @@ mod map_reduce {
reduce(key, || get(p, ref_count, is_done) );
}

fn map_reduce<K1: Copy Send, K2: Const Copy Send hash_key, V: Copy Send>(
fn map_reduce<K1: Copy Send, K2: Hash IterBytes Eq Const Copy Send hash_key, V: Copy Send>(
map: mapper<K1, K2, V>,
reduce: reducer<K2, V>,
inputs: ~[K1])
Expand Down