diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-01-18 09:50:06 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-01-18 09:50:06 +0100 |
| commit | 8269b349dd04f7561f9fe6c9e4ba514d3a7d21ab (patch) | |
| tree | 23c224ab21087ff282aa8e71162e93bb39bae216 /haddock-api | |
| parent | c2e89153c0aaf2dc4e3908701f19d739eb0d8b93 (diff) | |
| parent | 17388b0f0029d969d79353be7737eb01c7b8dc5f (diff) | |
Merge remote-tracking branch 'gridaphobe/ghc-head' into ghc-head
Diffstat (limited to 'haddock-api')
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 38271a04..b6dd06e9 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -34,8 +34,8 @@ import TyCon import Type import TyCoRep import TysPrim ( alphaTyVars ) -import TysWiredIn ( listTyConName, ipTyCon ) -import PrelNames ( hasKey, eqTyConKey ) +import TysWiredIn ( listTyConName ) +import PrelNames ( hasKey, eqTyConKey, ipClassKey ) import Unique ( getUnique ) import Util ( filterByList, filterOut ) import Var @@ -372,7 +372,7 @@ synifyType _ (TyConApp tc tys) | getName tc == listTyConName, [ty] <- tys = noLoc $ HsListTy (synifyType WithinType ty) -- ditto for implicit parameter tycons - | tc == ipTyCon + | tc `hasKey` ipClassKey , [name, ty] <- tys , Just x <- isStrLitTy name = noLoc $ HsIParamTy (HsIPName x) (synifyType WithinType ty) |