@@ -92,11 +92,11 @@ bUnionDisjoint =
9292 run = whnf (\ (as, bs) -> HM. union as bs)
9393 setupBytes s gen = do
9494 (trues, falses) <- Key.Bytes. genDisjoint s bytesLength gen
95- return (toMap trues, toMap falses)
95+ return (keysToMap trues, keysToMap falses)
9696 setupInts s gen = do
9797 ints <- genInts s gen
9898 let (trues, falses) = Data.List. partition (flip testBit (31 :: Int )) ints
99- return (toMap trues, toMap falses)
99+ return (keysToMap trues, keysToMap falses)
100100
101101bUnionEqual :: [Benchmark ]
102102bUnionEqual =
@@ -108,11 +108,11 @@ bUnionEqual =
108108 bytesEnv s = do
109109 g <- newIOGenM defaultGen
110110 ks <- Key.Bytes. genNBytes s bytesLength g
111- return (toMap ks)
111+ return (keysToMap ks)
112112 intsEnv s = do
113113 g <- newIOGenM defaultGen
114114 ks <- genInts s g
115- return (toMap ks)
115+ return (keysToMap ks)
116116
117117-- TODO: Separate benchmarks for overlap with pointer eq?!
118118bUnionOverlap :: [Benchmark ]
@@ -126,7 +126,10 @@ bUnionOverlap =
126126 g <- newIOGenM defaultGen
127127 (trues, falses) <- Key.Bytes. genDisjoint s bytesLength g
128128 let (a_sep, b_sep) = splitAt (s `div` 4 ) trues
129- return (toMap falses `HM.union` toMap a_sep, toMap falses `HM.union` toMap b_sep)
129+ return
130+ ( keysToMap falses `HM.union` keysToMap a_sep,
131+ keysToMap falses `HM.union` keysToMap b_sep
132+ )
130133 intsEnv s = do
131134 g <- newIOGenM defaultGen
132135 let s_overlap = s `div` 2
@@ -135,10 +138,13 @@ bUnionOverlap =
135138 overlap <- genInts s_overlap g
136139 a_sep <- genInts s_a_sep g
137140 b_sep <- genInts s_b_sep g
138- return (toMap overlap `HM.union` toMap a_sep, toMap overlap `HM.union` toMap b_sep)
141+ return
142+ ( keysToMap overlap `HM.union` keysToMap a_sep,
143+ keysToMap overlap `HM.union` keysToMap b_sep
144+ )
139145
140- toMap :: (Hashable k ) => [k ] -> HashMap k Int
141- toMap = HM. fromList . map (,1 )
146+ keysToMap :: (Hashable k ) => [k ] -> HashMap k Int
147+ keysToMap = HM. fromList . map (,1 )
142148
143149genInts ::
144150 (StatefulGen g m ) =>
0 commit comments