Wed Jul 8 08:27:56 UTC 2015

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

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T8584,wip/T9840,wip/api-ann-hstylit,wip/api-ann-hstylit-1,wip/api-ann-hstylit-2,wip/api-ann-hstylit-3,wip/api-ann-hstylit-4,wip/api-ann-hstylit-5,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/ast-annotations-separate,wip/ast-prepare-annotations,wip/ast-prepare-annotations-final,wip/ast-prepare-annotations-final2,wip/ast-prepare-annotations-final3,wip/ast-prepare-annotations-final4,wip/ast-prepare-annotations-final5,wip/ast-prepare-annotations-final6,wip/attoparsec-update,wip/landmine-param-family,wip/orf-new,wip/orf-reboot,wip/pattern-synonyms,wip/rae,wip/remove-cabal-dep,wip/trac-9744
Link       : http://git.haskell.org/haddock.git/commitdiff/70ce2cbf11ea6c861b5597527f768039d0571bf2

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

commit 70ce2cbf11ea6c861b5597527f768039d0571bf2
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Mon May 5 11:14:47 2014 +0200

    Move out Show and Eq instances to Types
    
    They are much more useful to the users here.


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

70ce2cbf11ea6c861b5597527f768039d0571bf2
 haddock-library/src/Documentation/Haddock/Types.hs       |  6 ++++++
 haddock-library/test/Documentation/Haddock/ParserSpec.hs | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/haddock-library/src/Documentation/Haddock/Types.hs b/haddock-library/src/Documentation/Haddock/Types.hs
index 3e25d23..b3118cc 100644
--- a/haddock-library/src/Documentation/Haddock/Types.hs
+++ b/haddock-library/src/Documentation/Haddock/Types.hs
@@ -24,6 +24,12 @@ instance Foldable Header where
 instance Traversable Header where
   traverse f (Header l a) = Header l `fmap` f a
 
+
+deriving instance Show a => Show (Header a)
+deriving instance (Show a, Show b) => Show (DocH a b)
+deriving instance Eq a => Eq (Header a)
+deriving instance (Eq a, Eq b) => Eq (DocH a b)
+
 data Hyperlink = Hyperlink
   { hyperlinkUrl   :: String
   , hyperlinkLabel :: Maybe String
diff --git a/haddock-library/test/Documentation/Haddock/ParserSpec.hs b/haddock-library/test/Documentation/Haddock/ParserSpec.hs
index 3889d55..8e73848 100644
--- a/haddock-library/test/Documentation/Haddock/ParserSpec.hs
+++ b/haddock-library/test/Documentation/Haddock/ParserSpec.hs
@@ -1,6 +1,5 @@
-{-# LANGUAGE OverloadedStrings, StandaloneDeriving
-             , FlexibleInstances, UndecidableInstances
-             , IncoherentInstances #-}
+{-# LANGUAGE OverloadedStrings, FlexibleInstances #-}
+{-# LANGUAGE IncoherentInstances, UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Documentation.Haddock.ParserSpec (main, spec) where
@@ -14,11 +13,6 @@ import           Test.QuickCheck
 
 type Doc id = DocH () id
 
-deriving instance Show a => Show (Header a)
-deriving instance Show a => Show (Doc a)
-deriving instance Eq a => Eq (Header a)
-deriving instance Eq a => Eq (Doc a)
-
 instance IsString (Doc String) where
   fromString = DocString
 

