[commit: haddock] ghc-7.8, v2.14, wip/pattern-synonym-sig-backport: Follow change in patSynSig (e811b00)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:28:21 UTC 2015


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

On branches: ghc-7.8,v2.14,wip/pattern-synonym-sig-backport
Link       : http://git.haskell.org/haddock.git/commitdiff/e811b00837d19340047ad83273b4aa2dc2534dd8

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

commit e811b00837d19340047ad83273b4aa2dc2534dd8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jun 6 11:33:09 2014 +0100

    Follow change in patSynSig
    
    Conflicts:
    	src/Haddock/Convert.hs


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

e811b00837d19340047ad83273b4aa2dc2534dd8
 src/Haddock/Convert.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs
index 1bf02e3..405bf20 100644
--- a/src/Haddock/Convert.hs
+++ b/src/Haddock/Convert.hs
@@ -94,10 +94,10 @@ tyThingToLHsDecl t = noLoc $ case t of
     (synifyType ImplicitizeForAll (dataConUserType dc)))
 
   AConLike (PatSynCon ps) ->
-      let (_, _, (req_theta, prov_theta)) = patSynSig ps
+      let (_, _, req_theta, prov_theta, _, res_ty) = patSynSig ps
       in SigD $ PatSynSig (synifyName ps)
                           (fmap (synifyType WithinType) (patSynTyDetails ps))
-                          (synifyType WithinType (patSynType ps))
+                          (synifyType WithinType res_ty)
                           (synifyCtx req_theta)
                           (synifyCtx prov_theta)
 



More information about the ghc-commits mailing list