Mon Nov 20 20:56:25 UTC 2017

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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11028,wip/T11028-2,wip/T11028-3,wip/T11080-open-data-kinds,wip/T11258,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/rae-nokinds,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/spj-wildcard-refactor,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/0d157fea7d1e4055abcb6453545f8bf326ce2279

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

commit 0d157fea7d1e4055abcb6453545f8bf326ce2279
Merge: 0413c54 83a9e9d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 12:18:17 2015 +0000

    Merge with origin/head



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

0d157fea7d1e4055abcb6453545f8bf326ce2279
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 9 +++++----
 haddock-api/src/Haddock/Convert.hs             | 6 ++----
 haddock-api/src/Haddock/Interface/Create.hs    | 6 +++---
 haddock-api/src/Haddock/Interface/Rename.hs    | 4 +++-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --cc haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index c523d61,8996fc8..dca1640

--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@@ -480,10 -486,10 +480,10 @@@ ppClassDecl summary links instances fix
                             -- there are different subdocs for different names in a single
                             -- type signature?
  
-     minimalBit = case [ s | L _ (MinimalSig _ s) <- lsigs ] of
+     minimalBit = case [ s | L _ (MinimalSig _ (L _ s)) <- lsigs ] of
        -- Miminal complete definition = every shown method
 -      And xs : _ | sort [getName n | L _ (Var (L _ n)) <- xs] ==
 +      And xs : _ | sort [getName n | Var (L _ n) <- xs] ==
-                    sort [getName n | L _ (TypeSig ns _) <- lsigs, L _ n <- ns]
+                    sort [getName n | L _ (TypeSig ns _ _) <- lsigs, L _ n <- ns]
          -> noHtml
  
        -- Minimal complete definition = the only shown method
diff --cc haddock-api/src/Haddock/Convert.hs
index 38851b1,a61e369..ce71cf8
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@@ -297,16 -305,8 +297,14 @@@ 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
 -                qvars ctx hat hs_res_ty Nothing
 +      \hat -> return $ noLoc $
 +              ConDecl { con_names = [name]
 +                      , con_explicit = False    -- we don't know nor care
 +                      , con_qvars = qvars
 +                      , con_cxt   = ctx
 +                      , con_details =  hat
 +                      , con_res = hs_res_ty
-                       , con_doc =  Nothing
-                 -- we don't want any "deprecated GADT syntax" warnings!
-                       , con_old_rec = False }
++                      , con_doc =  Nothing }
  
  synifyName :: NamedThing n => n -> Located Name
  synifyName = noLoc . getName

