diff options
| author | Richard Eisenberg <eir@cis.upenn.edu> | 2013-09-17 09:34:05 -0400 |
|---|---|---|
| committer | Richard Eisenberg <eir@cis.upenn.edu> | 2013-09-17 09:34:26 -0400 |
| commit | 61335db90219eba267de90da1742a5b38f856e52 (patch) | |
| tree | 5d9a33ece7ce5f0db02cdb3b824d4163c803d6f3 /src/Haddock/Convert.hs | |
| parent | 076bdb97ee66496deb07448593e0a925e1f0321a (diff) | |
Revision to reflect new role annotation syntax in GHC.
Diffstat (limited to 'src/Haddock/Convert.hs')
| -rw-r--r-- | src/Haddock/Convert.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs index 04acbc9b..0f7e5b9c 100644 --- a/src/Haddock/Convert.hs +++ b/src/Haddock/Convert.hs @@ -120,9 +120,8 @@ synifyTyCon tc = DataDecl { tcdLName = synifyName tc , tcdTyVars = -- tyConTyVars doesn't work on fun/prim, but we can make them up: let mk_hs_tv realKind fakeTyVar - = noLoc $ HsTyVarBndr (getName fakeTyVar) - (Just $ synifyKindSig realKind) - Nothing + = noLoc $ KindedTyVar (getName fakeTyVar) + (synifyKindSig realKind) in HsQTvs { hsq_kvs = [] -- No kind polymorphism , hsq_tvs = zipWith mk_hs_tv (fst (splitKindFunTys (tyConKind tc))) alphaTyVars --a, b, c... which are unfortunately all kind * @@ -276,8 +275,8 @@ synifyTyVars ktvs = HsQTvs { hsq_kvs = map tyVarName kvs where (kvs, tvs) = partition isKindVar ktvs synifyTyVar tv - | isLiftedTypeKind kind = noLoc (HsTyVarBndr name Nothing Nothing) - | otherwise = noLoc (HsTyVarBndr name (Just $ synifyKindSig kind) Nothing) + | isLiftedTypeKind kind = noLoc (UserTyVar name) + | otherwise = noLoc (KindedTyVar name (synifyKindSig kind)) where kind = tyVarKind tv name = getName tv |