[commit: haddock] wip/T3384: Match changes in GHC wip/T3384 branch (0b2ed3f)

[git at git.haskell.org]

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

On branch  : wip/T3384
Link       : http://git.haskell.org/haddock.git/commitdiff/0b2ed3fc26f70ec1d13ccaf58b6e6f0ab58dc550

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

commit 0b2ed3fc26f70ec1d13ccaf58b6e6f0ab58dc550
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 14 15:24:30 2016 +0200

    Match changes in GHC wip/T3384 branch


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

0b2ed3fc26f70ec1d13ccaf58b6e6f0ab58dc550
 haddock-api/src/Haddock/Backends/Hoogle.hs | 2 +-
 haddock-api/src/Haddock/Types.hs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/haddock-api/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index 48b9744..176496e 100644
--- a/haddock-api/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
@@ -85,7 +85,7 @@ dropHsDocTy = f
         f (HsDocTy a _) = f $ unL a
         f x = x
 
-outHsType :: (OutputableBndr a, OutputableBndr (NameOrRdrName a))
+outHsType :: (OutputableBndrId a, HasOccNameId a)
           => DynFlags -> HsType a -> String
 outHsType dflags = out dflags . dropHsDocTy
 
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index 5220e6e..d367ce7 100644
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@ -344,7 +344,7 @@ data InstType name
   | TypeInst  (Maybe (HsType name)) -- ^ Body (right-hand side)
   | DataInst (TyClDecl name)        -- ^ Data constructors
 
-instance (OutputableBndr a, OutputableBndr (NameOrRdrName a))
+instance (OutputableBndrId a, HasOccNameId a)
          => Outputable (InstType a) where
   ppr (ClassInst { .. }) = text "ClassInst"
       <+> ppr clsiCtx