Fix 'Eq2 HashMap' instance

Add missing 'instance Typeable HashMap'

Remove usage of (<$>)

Author: rockbmb

Data/HashMap/Base.hs

@@ -167,6 +167,7 @@ type role HashMapInner nominal representational
 -- | A wrapper over 'HashMapInner'. The 'Int' field represent the hashmap's
 -- size.
 data HashMap k v = HashMap {-# UNPACK #-} !Int !(HashMapInner k v)
+  deriving Typeable
 
 instance (NFData k, NFData v) => NFData (HashMapInner k v) where
     rnf Empty                 = ()
@@ -254,7 +255,7 @@ instance Traversable (HashMap k) where
     traverse f = traverseWithKey (const f)
 
 #if MIN_VERSION_base(4,9,0)
-instance Eq2 HashMapInner where
+instance Eq2 HashMap where
     liftEq2 = equal
 
 instance Eq k => Eq1 (HashMap k) where

Data/HashMap/Strict.hs

@@ -218,7 +218,7 @@ unsafeInsertWithInternal f k0 v0 m0 = runST (go h0 k0 v0 0 m0)
                     else do
                         let l' = x `seq` (L k x)
                         return $! (1, collision h l l')
-        | otherwise = (1,) <$> (x `seq` two s h k x hy ky y)
+        | otherwise = (x `seq` two s h k x hy ky y) >>= return . (1,)
     go h k x s t@(BitmapIndexed b ary)
         | b .&. m == 0 = do
             ary' <- A.insertM ary i $! leaf h k x