[commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor (e7ac58a)

[git at git.haskell.org]

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7ac58ae415bd2e8de55585a99ff5d57f2db2ba1/ghc

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

commit e7ac58ae415bd2e8de55585a99ff5d57f2db2ba1
Merge: 1ac0476 5e04c38
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 24 17:28:50 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsExpr.hs
    	compiler/rename/RnSource.hs
    	testsuite/tests/arrows/should_fail/T5380.stderr
    	testsuite/tests/gadt/T3169.stderr
    	testsuite/tests/gadt/rw.stderr
    	testsuite/tests/ghci/scripts/Defer02.stderr
    	testsuite/tests/ghci/scripts/ghci050.stderr
    	testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr
    	testsuite/tests/indexed-types/should_compile/T3208b.stderr
    	testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
    	testsuite/tests/indexed-types/should_fail/Overlap6.stderr
    	testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
    	testsuite/tests/indexed-types/should_fail/T3330a.stderr
    	testsuite/tests/indexed-types/should_fail/T3440.stderr
    	testsuite/tests/indexed-types/should_fail/T4093a.stderr
    	testsuite/tests/indexed-types/should_fail/T4093b.stderr
    	testsuite/tests/indexed-types/should_fail/T4174.stderr
    	testsuite/tests/indexed-types/should_fail/T4272.stderr
    	testsuite/tests/indexed-types/should_fail/T7194.stderr
    	testsuite/tests/indexed-types/should_fail/T9662.stderr
    	testsuite/tests/monadfail/MonadFailErrors.stderr
    	testsuite/tests/parser/should_fail/T7848.stderr
    	testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr
    	testsuite/tests/partial-sigs/should_compile/T10438.stderr
    	testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotEnabled.stderr
    	testsuite/tests/partial-sigs/should_fail/T10045.stderr
    	testsuite/tests/partial-sigs/should_fail/T10615.stderr
    	testsuite/tests/partial-sigs/should_fail/Trac10045.stderr
    	testsuite/tests/polykinds/T7230.stderr
    	testsuite/tests/polykinds/T7438.stderr
    	testsuite/tests/th/T10267.stderr
    	testsuite/tests/typecheck/should_compile/FD1.stderr
    	testsuite/tests/typecheck/should_compile/FD2.stderr
    	testsuite/tests/typecheck/should_compile/FD3.stderr
    	testsuite/tests/typecheck/should_compile/tc141.stderr
    	testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
    	testsuite/tests/typecheck/should_fail/T10285.stderr
    	testsuite/tests/typecheck/should_fail/T10534.stderr
    	testsuite/tests/typecheck/should_fail/T1899.stderr
    	testsuite/tests/typecheck/should_fail/T3540.stderr
    	testsuite/tests/typecheck/should_fail/T7453.stderr
    	testsuite/tests/typecheck/should_fail/T7696.stderr
    	testsuite/tests/typecheck/should_fail/T7748a.stderr
    	testsuite/tests/typecheck/should_fail/T7869.stderr
    	testsuite/tests/typecheck/should_fail/T8450.stderr
    	testsuite/tests/typecheck/should_fail/tcfail032.stderr
    	testsuite/tests/typecheck/should_fail/tcfail057.stderr
    	testsuite/tests/typecheck/should_fail/tcfail065.stderr
    	testsuite/tests/typecheck/should_fail/tcfail068.stderr
    	testsuite/tests/typecheck/should_fail/tcfail076.stderr
    	testsuite/tests/typecheck/should_fail/tcfail131.stderr
    	testsuite/tests/typecheck/should_fail/tcfail175.stderr
    	testsuite/tests/typecheck/should_fail/tcfail179.stderr
    	testsuite/tests/typecheck/should_fail/tcfail201.stderr



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


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 e7ac58ae415bd2e8de55585a99ff5d57f2db2ba1