[commit: packages/containers] ghc-head: Rename join to link ... (5b7e912)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5b7e912f281bcafd080f4095c94d9a7ca1d59c29

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

commit 5b7e912f281bcafd080f4095c94d9a7ca1d59c29
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Oct 7 15:15:59 2013 +0200

    Rename join to link ...
    
    ... to get ready for AMP in GHC 7.10 and silence warning in GHC 7.8.
    
    Keeping join would be quite a hassle. We need to silence warning in GHC
    7.8, but we cannot say
      import Prelude hiding (....., join)
    because join is not exported untiil 7.10. We also do not want to
    explicitly list imported names from Prelude, because there are many
    (I tried and stopped after a dozen).
    
    We could silence the amp warning in GHC 7.7 - GHC 7.9 and have
    conditional Prelude import for base >= 4.8, hiding join in one of them.
    Nevertheless, this is too many problems compared to renaming an internal
    join function to link.


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

5b7e912f281bcafd080f4095c94d9a7ca1d59c29
 Data/IntMap/Base.hs   |   50 ++++++++++++++++++------------------
 Data/IntMap/Strict.hs |   18 ++++++-------
 Data/IntSet/Base.hs   |   20 +++++++--------
 Data/Map/Base.hs      |   68 ++++++++++++++++++++++++-------------------------
 Data/Map/Lazy.hs      |    2 +-
 Data/Map/Strict.hs    |   24 ++++++++---------
 Data/Set.hs           |    2 +-
 Data/Set/Base.hs      |   56 ++++++++++++++++++++--------------------
 8 files changed, 120 insertions(+), 120 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 5b7e912f281bcafd080f4095c94d9a7ca1d59c29