[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, wip/10268, wip/10313, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/orf-reboot: Track naming change in DataCon (04cf63d)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:36:58 UTC 2015


Repository : ssh://git@git.haskell.org/haddock

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,wip/10268,wip/10313,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/04cf63d0195837ed52075ed7d2676e71831e8a0b

>---------------------------------------------------------------

commit 04cf63d0195837ed52075ed7d2676e71831e8a0b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 8 15:50:22 2015 +0000

    Track naming change in DataCon


>---------------------------------------------------------------

04cf63d0195837ed52075ed7d2676e71831e8a0b
 haddock-api/src/Haddock/Convert.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 1b1a8a8..29d1339 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -265,15 +265,15 @@ synifyDataCon use_gadt_syntax dc =
   linear_tys = zipWith (\ty bang ->
             let tySyn = synifyType WithinType ty
                 src_bang = case bang of
-                             HsUnpack {} -> HsUserBang (Just True) True
-                             HsStrict    -> HsUserBang (Just False) True
+                             HsUnpack {} -> HsSrcBang (Just True) True
+                             HsStrict    -> HsSrcBang (Just False) True
                              _           -> bang
             in case src_bang of
                  HsNoBang -> tySyn
                  _        -> noLoc $ HsBangTy bang tySyn
             -- HsNoBang never appears, it's implied instead.
           )
-          arg_tys (dataConStrictMarks dc)
+          arg_tys (dataConSrcBangs dc)
   field_tys = zipWith (\field synTy -> noLoc $ ConDeclField
                                                [synifyName field] synTy Nothing)
                 (dataConFieldLabels dc) linear_tys



More information about the ghc-commits mailing list