diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2018-06-18 10:19:07 +0200 |
|---|---|---|
| committer | Alan Zimmerman <alan.zimm@gmail.com> | 2018-06-19 11:52:22 +0200 |
| commit | d58fff78de7d48546a22392cefdd0abab1f1ccec (patch) | |
| tree | 3c5f9ec0df0cf34a8c412016e6a72c5f92e883fe | |
| parent | 2755526abb478c2f51c9cf4b894de287dd318868 (diff) | |
Match changes in GHC for #14259
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 4 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 3410c7ba..511decae 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -338,7 +338,7 @@ synifyDataCon use_gadt_syntax dc = then return $ noLoc $ ConDeclGADT { con_g_ext = noExt , con_names = [name] - , con_forall = True + , con_forall = noLoc True , con_qvars = synifyTyVars (univ_tvs ++ ex_tvs) , con_mb_cxt = Just ctx , con_args = hat @@ -347,7 +347,7 @@ synifyDataCon use_gadt_syntax dc = else return $ noLoc $ ConDeclH98 { con_ext = noExt , con_name = name - , con_forall = True + , con_forall = noLoc True , con_ex_tvs = map synifyTyVar ex_tvs , con_mb_cxt = Just ctx , con_args = hat diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index 2d254414..b2c34bb4 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -169,7 +169,7 @@ getGADTConType :: ConDecl DocNameI -> LHsType DocNameI -- order to pretty-print it, and currently only in Haddock's code. So -- we are cavalier about locations and extensions, hence the -- 'undefined's -getGADTConType (ConDeclGADT { con_forall = has_forall +getGADTConType (ConDeclGADT { con_forall = L _ has_forall , con_qvars = qtvs , con_mb_cxt = mcxt, con_args = args , con_res_ty = res_ty }) @@ -201,7 +201,7 @@ getGADTConTypeG :: ConDecl (GhcPass p) -> LHsType (GhcPass p) -- order to pretty-print it, and currently only in Haddock's code. So -- we are cavalier about locations and extensions, hence the -- 'undefined's -getGADTConTypeG (ConDeclGADT { con_forall = has_forall +getGADTConTypeG (ConDeclGADT { con_forall = L _ has_forall , con_qvars = qtvs , con_mb_cxt = mcxt, con_args = args , con_res_ty = res_ty }) |