diff options
| author | Graydon Hoare <[email protected]> | 2010-08-24 17:23:09 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-08-24 17:23:09 -0700 |
| commit | e846643d23ab20ca7fc194e358053ebf0f74d47e (patch) | |
| tree | 54ff082ed5f446ff057524c92509edefb7fd35e7 /src/lib/map.rs | |
| parent | Fix residual nonsense of storing crate-rel displacements in a closure pair (m... (diff) | |
| download | rust-e846643d23ab20ca7fc194e358053ebf0f74d47e.tar.xz rust-e846643d23ab20ca7fc194e358053ebf0f74d47e.zip | |
Fix mod-bug in std.map, work around bug in closure typaram capture, enable insert-tests in lib-map.rs.
Diffstat (limited to 'src/lib/map.rs')
| -rw-r--r-- | src/lib/map.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/map.rs b/src/lib/map.rs index 786e5ba1..b6162e02 100644 --- a/src/lib/map.rs +++ b/src/lib/map.rs @@ -47,18 +47,17 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] { // fixed key. fn hashl[K](&hashfn[K] hasher, uint nbkts, &K key) -> uint { - ret (hasher(key) >>> (sys.rustrt.size_of[uint]() * 8u / 2u)) - % nbkts; + ret (hasher(key) >>> (sys.rustrt.size_of[uint]() * 8u / 2u)); } fn hashr[K](&hashfn[K] hasher, uint nbkts, &K key) -> uint { ret ((((~ 0u) >>> (sys.rustrt.size_of[uint]() * 8u / 2u)) - & hasher(key)) * 2u + 1u) - % nbkts; + & hasher(key)) * 2u + 1u); } fn hash[K](&hashfn[K] hasher, uint nbkts, &K key, uint i) -> uint { - ret hashl[K](hasher, nbkts, key) + i * hashr[K](hasher, nbkts, key); + ret (hashl[K](hasher, nbkts, key) + + i * hashr[K](hasher, nbkts, key)) % nbkts; } /** |