[commit: haddock] master, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3: Track naming change in DataCon (df0239b)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:37:31 UTC 2015


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

On branches: master,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3
Link       : http://git.haskell.org/haddock.git/commitdiff/df0239b587e2a25531962f5b46f715ebb9b09685

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

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

    Track naming change in DataCon
    
    (cherry picked from commit 04cf63d0195837ed52075ed7d2676e71831e8a0b)


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

df0239b587e2a25531962f5b46f715ebb9b09685
 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 b52c331..ac7f8bd 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -264,15 +264,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