[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, revert-408-bugfix_394: Data.IntMap.Internal: actually exporting mergeA etc (f6ceb8c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branches: cleaned_bugfix394,master,merge-doc-target,merge-fixes-5.9,revert-408-bugfix_394
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f6ceb8ce04e08bbdc3bb7a023879a589ae01a7e5

>---------------------------------------------------------------

commit f6ceb8ce04e08bbdc3bb7a023879a589ae01a7e5
Author: wren romano <wren at community.haskell.org>
Date:   Sun Dec 11 14:17:55 2016 -0800

    Data.IntMap.Internal: actually exporting mergeA etc


>---------------------------------------------------------------

f6ceb8ce04e08bbdc3bb7a023879a589ae01a7e5
 Data/IntMap/Internal.hs | 36 +++++++++++++++++++++++++++++++++++-
 Data/Map/Internal.hs    |  0
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Data/IntMap/Internal.hs b/Data/IntMap/Internal.hs
index ba8efb6..e909338 100644
--- a/Data/IntMap/Internal.hs
+++ b/Data/IntMap/Internal.hs
@@ -125,7 +125,41 @@ module Data.IntMap.Internal (
     , intersectionWith
     , intersectionWithKey
 
-    -- ** Universal combining function
+    -- ** General combining function
+    , SimpleWhenMissing
+    , SimpleWhenMatched
+    , runWhenMatched
+    , runWhenMissing
+    , merge
+    -- *** @WhenMatched@ tactics
+    , zipWithMaybeMatched
+    , zipWithMatched
+    -- *** @WhenMissing@ tactics
+    , mapMaybeMissing
+    , dropMissing
+    , preserveMissing
+    , mapMissing
+    , filterMissing
+
+    -- ** Applicative general combining function
+    , WhenMissing (..)
+    , WhenMatched (..)
+    , mergeA
+    -- *** @WhenMatched@ tactics
+    -- | The tactics described for 'merge' work for
+    -- 'mergeA' as well. Furthermore, the following
+    -- are available.
+    , zipWithMaybeAMatched
+    , zipWithAMatched
+    -- *** @WhenMissing@ tactics
+    -- | The tactics described for 'merge' work for
+    -- 'mergeA' as well. Furthermore, the following
+    -- are available.
+    , traverseMaybeMissing
+    , traverseMissing
+    , filterAMissing
+
+    -- ** Deprecated general combining function
     , mergeWithKey
     , mergeWithKey'