diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2014-11-21 11:23:09 -0600 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-12-12 07:22:25 +0000 |
| commit | 79629515c0fd71baf182a487df94cb5eaa27ab47 (patch) | |
| tree | 019051026720a9f82ace55f53c2070e916ebc905 /haddock-api/src/Haddock/Convert.hs | |
| parent | d3f72165640de939eef36910f89f37f2a9154d31 (diff) | |
Follow API changes in D426
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Conflicts:
haddock-api/src/Haddock/Backends/LaTeX.hs
haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
haddock-api/src/Haddock/Convert.hs
Diffstat (limited to 'haddock-api/src/Haddock/Convert.hs')
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 8940d935..1c87d196 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -274,8 +274,8 @@ synifyDataCon use_gadt_syntax dc = -- HsNoBang never appears, it's implied instead. ) arg_tys (dataConStrictMarks dc) - field_tys = zipWith (\field synTy -> ConDeclField - (synifyName field) synTy Nothing) + field_tys = zipWith (\field synTy -> noLoc $ ConDeclField + [synifyName field] synTy Nothing) (dataConFieldLabels dc) linear_tys hs_arg_tys = case (use_named_field_syntax, use_infix_syntax) of (True,True) -> Left "synifyDataCon: contradiction!" @@ -289,12 +289,11 @@ synifyDataCon use_gadt_syntax dc = else ResTyH98 -- finally we get synifyDataCon's result! in hs_arg_tys >>= - \hat -> return . noLoc $ ConDecl name Implicit {-we don't know nor care-} + \hat -> return . noLoc $ ConDecl [name] Implicit -- we don't know nor care qvars ctx hat hs_res_ty Nothing -- we don't want any "deprecated GADT syntax" warnings! False - synifyName :: NamedThing n => n -> Located Name synifyName = noLoc . getName |