Make setting of hash optional in fromList

Author: jappeace

Data/HashMap/Internal.hs

@@ -103,6 +103,7 @@ module Data.HashMap.Internal
       -- ** Lists
     , toList
     , fromList
+    , fromList'
     , fromListWith
     , fromListWithKey
 
@@ -337,10 +338,10 @@ instance (Eq k, Hashable k, KnownNat salt) => Monoid (HashMapT salt k v) where
   {-# INLINE mappend #-}
 
 instance (Data k, Data v, Eq k, Hashable k, KnownNat salt) => Data (HashMapT salt k v) where
-    gfoldl f z m   = z fromList `f` toList m
+    gfoldl f z m   = z fromList' `f` toList m
     toConstr _     = fromListConstr
     gunfold k z c  = case constrIndex c of
-        1 -> k (z fromList)
+        1 -> k (z fromList')
         _ -> error "gunfold"
     dataTypeOf _   = hashMapDataType
     dataCast2 f    = gcast2 f
@@ -368,7 +369,7 @@ instance Show k => Show1 (HashMapT salt k) where
 
 instance (Eq k, Hashable k, Read k, KnownNat salt) => Read1 (HashMapT salt k) where
     liftReadsPrec rp rl = readsData $
-        readsUnaryWith (liftReadsPrec rp' rl') "fromList" fromList
+        readsUnaryWith (liftReadsPrec rp' rl') "fromList" fromList'
       where
         rp' = liftReadsPrec rp rl
         rl' = liftReadList rp rl
@@ -378,7 +379,7 @@ instance (Eq k, Hashable k, Read k, Read e, KnownNat salt) => Read (HashMapT sal
     readPrec = parens $ prec 10 $ do
       Ident "fromList" <- lexP
       xs <- readPrec
-      return (fromList xs)
+      return (fromList' xs)
 
     readListPrec = readListPrecDefault
 
@@ -1826,7 +1827,7 @@ traverseWithKey f = go
 --
 -- @since 0.2.14.0
 mapKeys :: (Eq k2, Hashable k2, KnownNat salt) => (k1 -> k2) -> HashMapT salt k1 v -> HashMapT salt k2 v
-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) []
+mapKeys f = fromList' . foldrWithKey (\k x xs -> (f k, x) : xs) []
 
 ------------------------------------------------------------------------
 -- * Difference and intersection
@@ -2126,10 +2127,15 @@ toList t = build (\ c z -> foldrWithKey (curry c) z t)
 
 -- | /O(n)/ Construct a map with the supplied mappings.  If the list
 -- contains duplicate mappings, the later mappings take precedence.
-fromList :: (Eq k, Hashable k, KnownNat salt) => [(k, v)] -> HashMapT salt k v
-fromList = L.foldl' (\ m (k, v) -> unsafeInsert k v m) empty'
+fromList :: (Eq k, Hashable k) => [(k, v)] -> HashMap k v
+fromList = fromList'
 {-# INLINABLE fromList #-}
 
+-- | Same as 'fromList' but allows setting of a custom salt.
+fromList' :: (Eq k, Hashable k, KnownNat salt) => [(k, v)] -> HashMapT salt k v
+fromList' = L.foldl' (\ m (k, v) -> unsafeInsert k v m) empty'
+{-# INLINABLE fromList' #-}
+
 -- | /O(n*log n)/ Construct a map from a list of elements.  Uses
 -- the provided function @f@ to merge duplicate entries with
 -- @(f newVal oldVal)@.
@@ -2160,10 +2166,15 @@ fromList = L.foldl' (\ m (k, v) -> unsafeInsert k v m) empty'
 --
 -- > fromListWith f [(k, a), (k, b), (k, c), (k, d)]
 -- > = fromList [(k, f d (f c (f b a)))]
-fromListWith :: (Eq k, Hashable k, KnownNat salt) => (v -> v -> v) -> [(k, v)] -> HashMapT salt k v
-fromListWith f = L.foldl' (\ m (k, v) -> unsafeInsertWith f k v m) empty'
+fromListWith :: (Eq k, Hashable k) => (v -> v -> v) -> [(k, v)] -> HashMap k v
+fromListWith = fromListWith'
 {-# INLINE fromListWith #-}
 
+-- | same as 'fromListWith' but allows setting of custom salt
+fromListWith' :: (Eq k, Hashable k, KnownNat salt) => (v -> v -> v) -> [(k, v)] -> HashMapT salt k v
+fromListWith' f = L.foldl' (\ m (k, v) -> unsafeInsertWith f k v m) empty'
+{-# INLINE fromListWith' #-}
+
 -- | /O(n*log n)/ Construct a map from a list of elements.  Uses
 -- the provided function to merge duplicate entries.
 --
@@ -2190,10 +2201,15 @@ fromListWith f = L.foldl' (\ m (k, v) -> unsafeInsertWith f k v m) empty'
 -- > = fromList [(k, f k d (f k c (f k b a)))]
 --
 -- @since 0.2.11
-fromListWithKey :: (Eq k, Hashable k, KnownNat salt) => (k -> v -> v -> v) -> [(k, v)] -> HashMapT salt k v
-fromListWithKey f = L.foldl' (\ m (k, v) -> unsafeInsertWithKey f k v m) empty'
+fromListWithKey :: (Eq k, Hashable k) => (k -> v -> v -> v) -> [(k, v)] -> HashMap k v
+fromListWithKey = fromListWithKey'
 {-# INLINE fromListWithKey #-}
 
+-- | same as 'fromListWithKey' but allows setting of custom salt
+fromListWithKey' :: (Eq k, Hashable k, KnownNat salt) => (k -> v -> v -> v) -> [(k, v)] -> HashMapT salt k v
+fromListWithKey' f = L.foldl' (\ m (k, v) -> unsafeInsertWithKey f k v m) empty'
+{-# INLINE fromListWithKey' #-}
+
 ------------------------------------------------------------------------
 -- Array operations
 
@@ -2378,5 +2394,5 @@ ptrEq x y = isTrue# (reallyUnsafePtrEquality# x y ==# 1#)
 -- IsList instance
 instance (Eq k, Hashable k, KnownNat salt) => Exts.IsList (HashMapT salt k v) where
     type Item (HashMapT salt k v) = (k, v)
-    fromList = fromList
+    fromList = fromList'
     toList   = toList

Data/HashMap/Internal/Strict.hs

@@ -118,6 +118,9 @@ module Data.HashMap.Internal.Strict
     , fromList
     , fromListWith
     , fromListWithKey
+    , fromList'
+    , fromListWith'
+    , fromListWithKey'
     ) where
 
 import Data.Bits ((.&.), (.|.))
@@ -136,7 +139,9 @@ import Data.HashMap.Internal hiding (
     insert, insertWith, singleton',
     differenceWith, intersectionWith, intersectionWithKey, map, mapWithKey,
     mapMaybe, mapMaybeWithKey, singleton, update, unionWith, unionWithKey,
-    traverseWithKey)
+    traverseWithKey
+    , fromListWithKey', fromListWith', fromList'
+    )
 import Data.HashMap.Internal.Unsafe (runST)
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity
@@ -642,10 +647,15 @@ intersectionWithKey f a b = foldlWithKey' go empty' a
 -- | /O(n*log n)/ Construct a map with the supplied mappings.  If the
 -- list contains duplicate mappings, the later mappings take
 -- precedence.
-fromList :: (Eq k, Hashable k, KnownNat salt) => [(k, v)] -> HashMapT salt k v
-fromList = L.foldl' (\ m (k, !v) -> HM.unsafeInsert k v m) empty'
+fromList :: (Eq k, Hashable k) => [(k, v)] -> HashMap k v
+fromList = fromList'
 {-# INLINABLE fromList #-}
 
+-- | Same as 'fromList' but allows setting of a custom salt.
+fromList' :: (Eq k, Hashable k, KnownNat salt) => [(k, v)] -> HashMapT salt k v
+fromList' = L.foldl' (\ m (k, !v) -> HM.unsafeInsert k v m) empty'
+{-# INLINABLE fromList' #-}
+
 -- | /O(n*log n)/ Construct a map from a list of elements.  Uses
 -- the provided function @f@ to merge duplicate entries with
 -- @(f newVal oldVal)@.
@@ -676,10 +686,15 @@ fromList = L.foldl' (\ m (k, !v) -> HM.unsafeInsert k v m) empty'
 --
 -- > fromListWith f [(k, a), (k, b), (k, c), (k, d)]
 -- > = fromList [(k, f d (f c (f b a)))]
-fromListWith :: (Eq k, Hashable k, KnownNat salt) => (v -> v -> v) -> [(k, v)] -> HashMapT salt k v
-fromListWith f = L.foldl' (\ m (k, v) -> unsafeInsertWith f k v m) empty'
+fromListWith :: (Eq k, Hashable k) => (v -> v -> v) -> [(k, v)] -> HashMap k v
+fromListWith = fromListWith'
 {-# INLINE fromListWith #-}
 
+-- | same as 'fromListWith' but allows setting of custom salt
+fromListWith' :: (Eq k, Hashable k, KnownNat salt) => (v -> v -> v) -> [(k, v)] -> HashMapT salt k v
+fromListWith' f = L.foldl' (\ m (k, v) -> unsafeInsertWith f k v m) empty'
+{-# INLINE fromListWith' #-}
+
 -- | /O(n*log n)/ Construct a map from a list of elements.  Uses
 -- the provided function to merge duplicate entries.
 --
@@ -706,10 +721,14 @@ fromListWith f = L.foldl' (\ m (k, v) -> unsafeInsertWith f k v m) empty'
 -- > = fromList [(k, f k d (f k c (f k b a)))]
 --
 -- @since 0.2.11
-fromListWithKey :: (Eq k, Hashable k, KnownNat salt) => (k -> v -> v -> v) -> [(k, v)] -> HashMapT salt k v
-fromListWithKey f = L.foldl' (\ m (k, v) -> unsafeInsertWithKey f k v m) empty'
+fromListWithKey :: (Eq k, Hashable k) => (k -> v -> v -> v) -> [(k, v)] -> HashMap k v
+fromListWithKey = fromListWithKey'
 {-# INLINE fromListWithKey #-}
 
+-- | same as 'fromListWithKey' but allows setting of custom salt
+fromListWithKey' :: (Eq k, Hashable k, KnownNat salt) => (k -> v -> v -> v) -> [(k, v)] -> HashMapT salt k v
+fromListWithKey' f = L.foldl' (\ m (k, v) -> unsafeInsertWithKey f k v m) empty'
+{-# INLINE fromListWithKey' #-}
 ------------------------------------------------------------------------
 -- Array operations
 

Data/HashMap/Strict.hs

@@ -101,6 +101,9 @@ module Data.HashMap.Strict
     , fromList
     , fromListWith
     , fromListWithKey
+    , fromList'
+    , fromListWith'
+    , fromListWithKey'
 
       -- ** HashSets
     , HS.keysSet