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

[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/744d4b0086f9aac866b98227158a41125153e1e4/ghc

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

commit 744d4b0086f9aac866b98227158a41125153e1e4
Merge: 57b995b 6dce643
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 1 12:48:32 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor



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

744d4b0086f9aac866b98227158a41125153e1e4
 compiler/basicTypes/MkId.hs     | 12 +++++-----
 compiler/hsSyn/HsTypes.hs       |  2 +-
 compiler/typecheck/TcTyDecls.hs |  6 ++---
 ghc.mk                          | 17 +++++---------
 mk/config.mk.in                 | 49 +++++++++++++++++++++++++++++++++--------
 mk/warnings.mk                  | 44 ++++++++++++++++++++++++++++--------
 rules/distdir-way-opts.mk       | 19 +++++++++++++++-
 utils/mkUserGuidePart/Main.hs   |  5 -----
 8 files changed, 108 insertions(+), 46 deletions(-)

diff --cc compiler/hsSyn/HsTypes.hs
index f7883f2,eda643c..ed4c3be
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@@ -201,14 -153,13 +201,14 @@@ type LHsKind name = Located (HsKind nam
        -- For details on above see note [Api annotations] in ApiAnnotation
  
  --------------------------------------------------
 ---             LHsTyVarBndrs
 ---  The quantified binders in a HsForallTy
 +--             LHsQTyVars
 +--  The explicitly-quantified binders in a data/type declaration
- SQua
+ 
  type LHsTyVarBndr name = Located (HsTyVarBndr name)
 +                         -- See Note [HsType binders]
  
 -data LHsTyVarBndrs name
 -  = HsQTvs { hsq_kvs :: [Name]                  -- Kind variables
 +data LHsQTyVars name   -- See Note [HsType binders]
 +  = HsQTvs { hsq_kvs :: PostRn name [Name]      -- Kind variables
             , hsq_tvs :: [LHsTyVarBndr name]     -- Type variables
               -- See Note [HsForAllTy tyvar binders]
      }