[commit: packages/pretty] master: Fix testsuite (21fc457)

git at git.haskell.org git at git.haskell.org
Thu Feb 2 19:15:17 UTC 2017


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

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/21fc4577b1ce2bcd63f3064282f755371160894a

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

commit 21fc4577b1ce2bcd63f3064282f755371160894a
Author: David Terei <code at davidterei.com>
Date:   Wed Jun 1 21:17:22 2016 -0700

    Fix testsuite


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

21fc4577b1ce2bcd63f3064282f755371160894a
 src/Text/PrettyPrint/Annotated/HughesPJ.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
index dc2133a..77a59c2 100644
--- a/src/Text/PrettyPrint/Annotated/HughesPJ.hs
+++ b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
@@ -262,7 +262,11 @@ data TextDetails = Chr  {-# UNPACK #-} !Char -- ^ A single Char fragment
 -- Combining @Doc@ values
 #if __GLASGOW_HASKELL__ >= 800
 instance Semi.Semigroup (Doc a) where
+#ifndef TESTING
     (<>) = (Text.PrettyPrint.Annotated.HughesPJ.<>)
+#else
+    (<>) = (PrettyTestVersion.<>)
+#endif
 
 instance Monoid (Doc a) where
     mempty  = empty



More information about the ghc-commits mailing list