[commit: ghc] master: Fix #11811. (b1084fd)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b1084fd700e6bbe9d0d787046a6aabdb193982c4/ghc

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

commit b1084fd700e6bbe9d0d787046a6aabdb193982c4
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Apr 7 16:44:06 2016 +0200

    Fix #11811.
    
    Previously, I had forgotten to omit variables already in scope
    from the TypeInType CUSK check. Simple enough to fix.
    
    Test case: typecheck/should_compile/T11811


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

b1084fd700e6bbe9d0d787046a6aabdb193982c4
 compiler/hsSyn/HsDecls.hs                          |  2 ++
 compiler/rename/RnSource.hs                        | 37 +++++++++++-----------
 compiler/rename/RnTypes.hs                         | 29 ++++++++++-------
 testsuite/tests/typecheck/should_compile/T11811.hs |  8 +++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 5 files changed, 46 insertions(+), 31 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 b1084fd700e6bbe9d0d787046a6aabdb193982c4