[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-408-bugfix_394: Add general merge functions for maps (9fc8b45)

[git at git.haskell.org]

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

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

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

commit 9fc8b45b71879b040cdb101ba4bd1fd923b4ae1a
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Aug 8 11:52:23 2016 -0400

    Add general merge functions for maps
    
    * Add `merge` and `mergeA` for `Data.Map`,
      in the new modules `Data.Map.Lazy.Merge` and
      `Data.Map.Strict.Merge`.
    
    * Expose internal modules per Ed Kmett's request
    
    * Make `difference` for maps and sets conform more closely
      to the algorithm in Blelloch et al so we can rely on their proof.


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

9fc8b45b71879b040cdb101ba4bd1fd923b4ae1a
 Data/IntMap/Base.hs                        |   15 +
 Data/IntSet/Base.hs                        |   15 +
 Data/Map.hs                                |    8 +-
 Data/Map/Base.hs                           |  731 ++++-
 Data/Map/Lazy.hs                           |   17 +-
 Data/Map/Lazy/Merge.hs                     |  103 +
 Data/Map/Strict.hs                         | 1250 +--------
 Data/Map/{Strict.hs => Strict/Internal.hs} |  403 ++-
 Data/Map/Strict/Merge.hs                   |   99 +
 Data/Sequence.hs                           | 4120 +---------------------------
 Data/{Sequence.hs => Sequence/Base.hs}     |   30 +-
 Data/Set.hs                                |    8 +-
 Data/Set/Base.hs                           |   19 +-
 Data/Utils/BitQueue.hs                     |   16 +
 Data/Utils/BitUtil.hs                      |   13 +
 Data/Utils/PtrEquality.hs                  |   30 +-
 Data/Utils/StrictFold.hs                   |   13 +
 Data/Utils/StrictMaybe.hs                  |   15 +
 Data/Utils/StrictPair.hs                   |   16 +
 changelog.md                               |    7 +
 containers.cabal                           |   15 +-
 tests/map-properties.hs                    |   27 +-
 tests/seq-properties.hs                    |    2 +-
 23 files changed, 1446 insertions(+), 5526 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9fc8b45b71879b040cdb101ba4bd1fd923b4ae1a