[commit: haddock] alexbiehl-patch-1, ghc-head, ghc-head1, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, travis, v2.18, wip/T14529, wip/rae, wip/remove-frames, wip/remove-frames1, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Merge branch 'ghc-head' (db13d5f)

[git at git.haskell.org]

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

On branches: alexbiehl-patch-1,ghc-head,ghc-head1,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.18,wip/T14529,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/db13d5f56d8e693b44bafc793d7b3bfac1c25b91

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

commit db13d5f56d8e693b44bafc793d7b3bfac1c25b91
Merge: 240bc38 d2be5e8
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Mar 10 10:21:55 2017 -0500

    Merge branch 'ghc-head'



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

db13d5f56d8e693b44bafc793d7b3bfac1c25b91
 haddock-api/haddock-api.cabal                      |  2 +-
 haddock-api/src/Haddock.hs                         | 24 ++++-----
 haddock-api/src/Haddock/Backends/Hoogle.hs         | 13 +++--
 .../src/Haddock/Backends/Hyperlinker/Ast.hs        | 12 ++---
 .../src/Haddock/Backends/Hyperlinker/Parser.hs     | 12 ++++-
 .../src/Haddock/Backends/Hyperlinker/Types.hs      |  3 ++
 haddock-api/src/Haddock/Backends/LaTeX.hs          | 26 ++++++----
 haddock-api/src/Haddock/Backends/Xhtml.hs          |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs     | 48 +++++++++---------
 haddock-api/src/Haddock/Backends/Xhtml/Names.hs    |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Utils.hs    |  9 ++--
 haddock-api/src/Haddock/Convert.hs                 | 46 +++++++++--------
 haddock-api/src/Haddock/GhcUtils.hs                |  2 +-
 .../src/Haddock/Interface/AttachInstances.hs       | 13 ++---
 haddock-api/src/Haddock/Interface/Create.hs        | 56 +++++++++++++--------
 haddock-api/src/Haddock/Interface/Rename.hs        | 58 +++++++++++++++-------
 haddock-api/src/Haddock/Interface/Specialize.hs    | 21 ++++----
 haddock-api/src/Haddock/InterfaceFile.hs           |  6 ++-
 haddock-api/src/Haddock/Types.hs                   | 20 +++++---
 haddock-api/src/Haddock/Utils.hs                   |  4 +-
 haddock-library/haddock-library.cabal              |  2 +-
 haddock.cabal                                      |  4 +-
 22 files changed, 228 insertions(+), 157 deletions(-)

diff --cc haddock-api/src/Haddock/Interface/Create.hs
index cb85569,4a65fc2..c8e6b98
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@@ -47,9 -48,9 +47,9 @@@ import Ba
  import RdrName
  import TcRnTypes
  import FastString (concatFS)
- import BasicTypes ( StringLiteral(..) )
+ import BasicTypes ( StringLiteral(..), SourceText(..) )
  import qualified Outputable as O
 -import HsDecls ( gadtDeclDetails,getConDetails )
 +import HsDecls ( getConDetails )
  
  -- | Use a 'TypecheckedModule' to produce an 'Interface'.
  -- To do this, we need access to already processed modules in the topological
@@@ -832,9 -837,9 +844,9 @@@ extractRecSel nm mdl t tvs (L _ con : r
    matching_fields flds = [ (l,f) | f@(L _ (ConDeclField ns _ _)) <- flds
                                   , L l n <- ns, selectorFieldOcc n == nm ]
    data_ty
 -    -- | ResTyGADT _ ty <- con_res con = ty
 +    -- ResTyGADT _ ty <- con_res con = ty
      | ConDeclGADT{} <- con = hsib_body $ con_type con
-     | otherwise = foldl' (\x y -> noLoc (HsAppTy x y)) (noLoc (HsTyVar (noLoc t))) tvs
+     | otherwise = foldl' (\x y -> noLoc (HsAppTy x y)) (noLoc (HsTyVar NotPromoted (noLoc t))) tvs
  
  -- | Keep export items with docs.
  pruneExportItems :: [ExportItem Name] -> [ExportItem Name]
diff --cc haddock-api/src/Haddock/Types.hs
index dcc50b9,1f44622..8addfa2
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@@ -1,7 -1,8 +1,10 @@@
- {-# LANGUAGE CPP #-}
- {-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving #-}
- {-# LANGUAGE TypeFamilies, RecordWildCards #-}
+ {-# LANGUAGE CPP, DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards #-}
+ {-# LANGUAGE FlexibleContexts #-}
+ {-# LANGUAGE UndecidableInstances #-} -- Note [Pass sensitive types]
+                                       -- in module GHC.PlaceHolder
++
  {-# OPTIONS_GHC -fno-warn-orphans #-}
++
  -----------------------------------------------------------------------------
  -- |
  -- Module      :  Haddock.Types