[commit: ghc] wip/rae: Merge #10817/#10899 (e27b267f) (8b69b31)

[git at git.haskell.org]

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

On branch  : wip/rae
Link       : http://ghc.haskell.org/trac/ghc/changeset/8b69b318802f59cfeb0779779cfbbebf74348fa0/ghc

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

commit 8b69b318802f59cfeb0779779cfbbebf74348fa0
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Oct 6 11:00:11 2015 -0400

    Merge #10817/#10899 (e27b267f)


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

8b69b318802f59cfeb0779779cfbbebf74348fa0
 compiler/iface/MkIface.hs                          |  2 +-
 compiler/iface/TcIface.hs                          |  2 +-
 compiler/typecheck/TcInstDcls.hs                   |  2 +-
 compiler/typecheck/TcRnDriver.hs                   |  4 ++--
 compiler/typecheck/TcTyClsDecls.hs                 | 22 ++++++++++++++--------
 compiler/typecheck/TcValidity.hs                   | 15 ++++++++++++++-
 compiler/types/Class.hs                            |  6 +++++-
 .../tests/indexed-types/should_fail/T10817.hs      | 14 ++++++++++++++
 .../tests/indexed-types/should_fail/T10817.stderr  |  6 ++++++
 .../tests/indexed-types/should_fail/T10899.hs      |  7 +++++++
 .../tests/indexed-types/should_fail/T10899.stderr  |  4 ++++
 testsuite/tests/indexed-types/should_fail/all.T    |  3 ++-
 testsuite/tests/typecheck/should_compile/tc253.hs  |  2 ++
 13 files changed, 73 insertions(+), 16 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 8b69b318802f59cfeb0779779cfbbebf74348fa0