diff options
| author | Eric Holk <eric.holk@gmail.com> | 2012-05-31 10:26:05 -0700 |
|---|---|---|
| committer | Eric Holk <eric.holk@gmail.com> | 2012-05-31 13:55:54 -0700 |
| commit | 3acc3c4d85e017edde2149eaabd44a78be5f7e17 (patch) | |
| tree | d5e619fb0814ee81395a14ec64e5dd5211b142bc /src/libstd | |
| parent | f394933641b5894a4c408aaae59ea3f632b3ee64 (diff) | |
| download | rust-3acc3c4d85e017edde2149eaabd44a78be5f7e17.tar.gz rust-3acc3c4d85e017edde2149eaabd44a78be5f7e17.zip | |
Make std::map require const keys.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/map.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/map.rs b/src/libstd/map.rs index 4967eaf9f85..08ae0bd80c4 100644 --- a/src/libstd/map.rs +++ b/src/libstd/map.rs @@ -282,7 +282,7 @@ Parameters: hasher - The hash function for key type K eqer - The equality function for key type K */ -fn hashmap<K: copy, V: copy>(hasher: hashfn<K>, eqer: eqfn<K>) +fn hashmap<K: const copy, V: copy>(hasher: hashfn<K>, eqer: eqfn<K>) -> hashmap<K, V> { chained::mk(hasher, eqer) } @@ -316,7 +316,9 @@ fn uint_hash<V: copy>() -> hashmap<uint, V> { #[doc = " Convenience function for adding keys to a hashmap with nil type keys "] -fn set_add<K: copy>(set: set<K>, key: K) -> bool { ret set.insert(key, ()); } +fn set_add<K: const copy>(set: set<K>, key: K) -> bool { + ret set.insert(key, ()); +} #[doc = " Convert a set into a vector. @@ -331,7 +333,7 @@ fn vec_from_set<T: copy>(s: set<T>) -> [T] { } #[doc = "Construct a hashmap from a vector"] -fn hash_from_vec<K: copy, V: copy>(hasher: hashfn<K>, eqer: eqfn<K>, +fn hash_from_vec<K: const copy, V: copy>(hasher: hashfn<K>, eqer: eqfn<K>, items: [(K, V)]) -> hashmap<K, V> { let map = hashmap(hasher, eqer); vec::iter(items) { |item| |