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/libsyntax/util | |
| parent | f394933641b5894a4c408aaae59ea3f632b3ee64 (diff) | |
| download | rust-3acc3c4d85e017edde2149eaabd44a78be5f7e17.tar.gz rust-3acc3c4d85e017edde2149eaabd44a78be5f7e17.zip | |
Make std::map require const keys.
Diffstat (limited to 'src/libsyntax/util')
| -rw-r--r-- | src/libsyntax/util/interner.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs index 89078bfaa36..0e69f2c10b7 100644 --- a/src/libsyntax/util/interner.rs +++ b/src/libsyntax/util/interner.rs @@ -5,18 +5,18 @@ import std::map; import std::map::{hashmap, hashfn, eqfn}; import dvec::{dvec, extensions}; -type interner<T> = +type interner<T: const> = {map: hashmap<T, uint>, vect: dvec<T>, hasher: hashfn<T>, eqer: eqfn<T>}; -fn mk<T: copy>(hasher: hashfn<T>, eqer: eqfn<T>) -> interner<T> { +fn mk<T: const copy>(hasher: hashfn<T>, eqer: eqfn<T>) -> interner<T> { let m = map::hashmap::<T, uint>(hasher, eqer); ret {map: m, vect: dvec(), hasher: hasher, eqer: eqer}; } -fn intern<T: copy>(itr: interner<T>, val: T) -> uint { +fn intern<T: const copy>(itr: interner<T>, val: T) -> uint { alt itr.map.find(val) { some(idx) { ret idx; } none { @@ -31,10 +31,10 @@ fn intern<T: copy>(itr: interner<T>, val: T) -> uint { // |get| isn't "pure" in the traditional sense, because it can go from // failing to returning a value as items are interned. But for typestate, // where we first check a pred and then rely on it, ceasing to fail is ok. -pure fn get<T: copy>(itr: interner<T>, idx: uint) -> T { +pure fn get<T: const copy>(itr: interner<T>, idx: uint) -> T { unchecked { itr.vect.get_elt(idx) } } -fn len<T>(itr: interner<T>) -> uint { ret itr.vect.len(); } +fn len<T: const>(itr: interner<T>) -> uint { ret itr.vect.len(); } |
