From e846643d23ab20ca7fc194e358053ebf0f74d47e Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 24 Aug 2010 17:23:09 -0700 Subject: Fix mod-bug in std.map, work around bug in closure typaram capture, enable insert-tests in lib-map.rs. --- src/lib/map.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/lib/map.rs') 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; } /** -- cgit v1.2.3