diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2016-11-03 14:08:10 +0200 |
|---|---|---|
| committer | Alan Zimmerman <alan.zimm@gmail.com> | 2016-12-07 21:14:28 +0200 |
| commit | 1dcefaddc52d968b20bb6107d620e1e0c6839970 (patch) | |
| tree | 5f6600b63d773b6d8be00fd1bb09a39d58e494c9 /haddock-api/src/Haddock/Types.hs | |
| parent | 2bd3429c40419100478545db6a8b2080786ca26d (diff) | |
Match changes in GHC wip/T3384 branch
Diffstat (limited to 'haddock-api/src/Haddock/Types.hs')
| -rw-r--r-- | haddock-api/src/Haddock/Types.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs index 5220e6e9..951faf5b 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 @@ -380,8 +380,8 @@ mkPseudoFamilyDecl (FamilyDecl { .. }) = PseudoFamilyDecl mkType (KindedTyVar (L loc name) lkind) = HsKindSig tvar lkind where - tvar = L loc (HsTyVar (L loc name)) - mkType (UserTyVar name) = HsTyVar name + tvar = L loc (HsTyVar NotPromoted (L loc name)) + mkType (UserTyVar name) = HsTyVar NotPromoted name -- | An instance head that may have documentation and a source location. |