diff options
| author | Stefan Plantikow <stefan.plantikow@googlemail.com> | 2012-01-05 17:18:40 +0100 |
|---|---|---|
| committer | Stefan Plantikow <stefan.plantikow@googlemail.com> | 2012-01-05 17:20:13 +0100 |
| commit | c8467977c4e0e3c719d83334d7290cbea127bb13 (patch) | |
| tree | f7f501c63ed5a2b960279bdbf51e216684d1b53c /src/comp/util | |
| parent | 1f10ee365c840cb5d54fe4eb32659f09d29ace38 (diff) | |
| parent | cc929fc9f9de6cf2d44df46ffc4b4d6e58e3a508 (diff) | |
Merge branch 'master' into kmath
Conflicts: src/libcore/float.rs
Diffstat (limited to 'src/comp/util')
| -rw-r--r-- | src/comp/util/common.rs | 2 | ||||
| -rw-r--r-- | src/comp/util/filesearch.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs index ba2d39ba2ec..8ec16de4dbe 100644 --- a/src/comp/util/common.rs +++ b/src/comp/util/common.rs @@ -20,7 +20,7 @@ fn hash_def(d: ast::def_id) -> uint { ret h; } -fn new_def_hash<copy V>() -> std::map::hashmap<ast::def_id, V> { +fn new_def_hash<V: copy>() -> std::map::hashmap<ast::def_id, V> { let hasher: std::map::hashfn<ast::def_id> = hash_def; let eqer: std::map::eqfn<ast::def_id> = def_eq; ret std::map::mk_hashmap::<ast::def_id, V>(hasher, eqer); diff --git a/src/comp/util/filesearch.rs b/src/comp/util/filesearch.rs index b7942ce8f48..ce8a1d7fde0 100644 --- a/src/comp/util/filesearch.rs +++ b/src/comp/util/filesearch.rs @@ -55,7 +55,7 @@ fn mk_filesearch(maybe_sysroot: option::t<fs::path>, } // FIXME #1001: This can't be an obj method -fn search<copy T>(filesearch: filesearch, pick: pick<T>) -> option::t<T> { +fn search<T: copy>(filesearch: filesearch, pick: pick<T>) -> option::t<T> { for lib_search_path in filesearch.lib_search_paths() { #debug("searching %s", lib_search_path); for path in fs::list_dir(lib_search_path) { |