[commit: haddock] ghc-head, wip/T14529, wip/revert-ttg-2017-11-20, 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: Fix merge fallout (1d34ec9)

[git at git.haskell.org]

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

On branches: ghc-head,wip/T14529,wip/revert-ttg-2017-11-20,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/1d34ec9dfe1a9a0a4b7f6d8361adf58ec1a421ae

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

commit 1d34ec9dfe1a9a0a4b7f6d8361adf58ec1a421ae
Author: alexbiehl <alex.biehl at gmail.com>
Date:   Sun Oct 8 20:18:46 2017 +0200

    Fix merge fallout


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

1d34ec9dfe1a9a0a4b7f6d8361adf58ec1a421ae
 haddock-api/src/Haddock/Backends/Xhtml.hs | 9 ++++-----
 haddock.cabal                             | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
index 1205e57..4055b1d 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml.hs
@@ -44,7 +44,6 @@ import System.Directory
 import Data.Map              ( Map )
 import qualified Data.Map as Map hiding ( Map )
 import qualified Data.Set as Set hiding ( Set )
-import Data.Function
 import Data.Ord              ( comparing )
 
 import DynFlags (Language(..))
@@ -365,7 +364,7 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode qual_opt ifaces = do
         qual    = makeModuleQual qual_opt aliases mdl
         mdl     = ifaceMod iface
 
-    goExport :: Module -> Qualification -> ExportItem DocName -> [Value]
+    goExport :: Module -> Qualification -> ExportItem DocNameI -> [Value]
     goExport mdl qual item
       | Just item_html <- processExport True links_info unicode qual item
       = [ Object
@@ -379,12 +378,12 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode qual_opt ifaces = do
       where
         names = exportName item ++ exportSubs item
 
-    exportSubs :: ExportItem DocName -> [DocName]
+    exportSubs :: ExportItem name -> [IdP name]
     exportSubs ExportDecl { expItemSubDocs } = map fst expItemSubDocs
     exportSubs _ = []
 
-    exportName :: ExportItem DocName -> [DocName]
-    exportName ExportDecl { expItemDecl } = getMainDeclBinder $ unLoc expItemDecl
+    exportName :: ExportItem name -> [IdP name]
+    exportName ExportDecl { expItemDecl } = getMainDeclBinder (unLoc expItemDecl)
     exportName ExportNoDecl { expItemName } = [expItemName]
     exportName _ = []
 
diff --git a/haddock.cabal b/haddock.cabal
index 4404205..6f3f64f 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -116,6 +116,7 @@ executable haddock
       Haddock.Interface.Specialize
       Haddock.Parser
       Haddock.Utils
+      Haddock.Utils.Json
       Haddock.Backends.Xhtml
       Haddock.Backends.Xhtml.Decl
       Haddock.Backends.Xhtml.DocMarkup