[commit: ghc] wip/GrowableAST: Merge branch 'master' of git://git.haskell.org/ghc into GrowableAST (6752680)

[git at git.haskell.org]

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

On branch  : wip/GrowableAST
Link       : http://ghc.haskell.org/trac/ghc/changeset/6752680ee9253aec991cfde4dc447479564e06e7/ghc

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

commit 6752680ee9253aec991cfde4dc447479564e06e7
Merge: 1c77176 c6462ab
Author: Shayan Najd <sh.najd at gmail.com>
Date:   Sun Aug 13 18:37:54 2017 +0000

    Merge branch 'master' of git://git.haskell.org/ghc into GrowableAST
    
    # Conflicts:
    #	compiler/deSugar/DsArrows.hs
    #	compiler/deSugar/DsBinds.hs
    #	compiler/hsSyn/HsBinds.hs
    #	compiler/hsSyn/HsDecls.hs
    #	compiler/hsSyn/HsExpr.hs
    #	compiler/hsSyn/HsLit.hs
    #	compiler/hsSyn/HsPat.hs
    #	compiler/typecheck/TcBinds.hs
    #	compiler/typecheck/TcClassDcl.hs
    #	compiler/typecheck/TcHsSyn.hs



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


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 6752680ee9253aec991cfde4dc447479564e06e7