Fix discrepancy between mergeWithKey impl and docs

The given `only` functions should only be called on nonempty trees.
Fixed for both Map and IntMap.

containers/changelog.md

@@ -9,6 +9,13 @@
   `Data.IntSet.splitMember` are now strict in the key. Previously, the key was
   ignored for an empty map or set. (Soumik Sarkar)
 
+### Bug fixes
+
+* Fix an issue where `Data.Map.mergeWithKey`, `Data.Map.Strict.mergeWithKey`,
+  `Data.IntMap.mergeWithKey`, `Data.IntMap.Strict.mergeWithKey` would call
+  provided `only` functions with empty maps, contrary to documentation.
+  (Soumik Sarkar)
+
 ## Unreleased with `@since` annotation for 0.7.1:
 
 ### Additions

containers/src/Data/IntMap/Internal.hs

@@ -1446,6 +1446,8 @@ mergeWithKey' bin' f g1 g2 = go
           | otherwise = maybe_link k1 (g1 t1) k2 (g2 t2)
         merge0 t1 _  Nil = g1 t1
 
+    go Nil Nil = Nil
+
     go Nil t2 = g2 t2
 
     maybe_link _ Nil _ t2 = t2

containers/src/Data/Map/Internal.hs

@@ -2782,6 +2782,7 @@ mergeWithKey :: Ord k
              -> Map k a -> Map k b -> Map k c
 mergeWithKey f g1 g2 = go
   where
+    go Tip Tip = Tip
     go Tip t2 = g2 t2
     go t1 Tip = g1 t1
     go (Bin _ kx x l1 r1) t2 =

containers/src/Data/Map/Strict/Internal.hs

@@ -1240,6 +1240,7 @@ mergeWithKey :: Ord k
              -> Map k a -> Map k b -> Map k c
 mergeWithKey f g1 g2 = go
   where
+    go Tip Tip = Tip
     go Tip t2 = g2 t2
     go t1 Tip = g1 t1
     go (Bin _ kx x l1 r1) t2 =