Merge pull request #46 from hvr/wip/smp-fix

Make compatible with upcoming Prelude.<> export in GHC 8.4/base-4.11
haskell · Sep 21, 2017 · 445e92d · 445e92d
2 parents a760167 + 2c644d5
commit 445e92d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Text/PrettyPrint.hs b/src/Text/PrettyPrint.hs
@@ -41,7 +41,7 @@ module Text.PrettyPrint (
 
         -- ** Combining documents
         empty,
-        (<>), (<+>), hcat, hsep,
+        (X.<>), (<+>), hcat, hsep,
         ($$), ($+$), vcat,
         sep, cat,
         fsep, fcat,
@@ -67,5 +67,5 @@ module Text.PrettyPrint (
 
     ) where
 
-import Text.PrettyPrint.HughesPJ
+import Text.PrettyPrint.HughesPJ as X
 
diff --git a/src/Text/PrettyPrint/Annotated.hs b/src/Text/PrettyPrint/Annotated.hs
@@ -41,7 +41,7 @@ module Text.PrettyPrint.Annotated (
 
         -- ** Combining documents
         empty,
-        (<>), (<+>), hcat, hsep,
+        (X.<>), (<+>), hcat, hsep,
         ($$), ($+$), vcat,
         sep, cat,
         fsep, fcat,
@@ -74,5 +74,5 @@ module Text.PrettyPrint.Annotated (
 
     ) where
 
-import Text.PrettyPrint.Annotated.HughesPJ
+import Text.PrettyPrint.Annotated.HughesPJ as X
 
diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
@@ -84,6 +84,9 @@ module Text.PrettyPrint.Annotated.HughesPJ (
 
 import Control.DeepSeq ( NFData(rnf) )
 import Data.Function   ( on )
+#if __GLASGOW_HASKELL__ >= 803
+import Prelude         hiding ( (<>) )
+#endif
 #if __GLASGOW_HASKELL__ >= 800
 import qualified Data.Semigroup as Semi ( Semigroup((<>)) )
 #elif __GLASGOW_HASKELL__ < 709

diff --git a/src/Text/PrettyPrint/HughesPJ.hs b/src/Text/PrettyPrint/HughesPJ.hs
@@ -86,6 +86,9 @@ import qualified Text.PrettyPrint.Annotated.HughesPJ as Ann
 
 import Control.DeepSeq ( NFData(rnf) )
 import Data.Function   ( on )
+#if __GLASGOW_HASKELL__ >= 803
+import Prelude         hiding ( (<>) )
+#endif
 #if __GLASGOW_HASKELL__ >= 800
 import qualified Data.Semigroup as Semi ( Semigroup((<>)) )
 #elif __GLASGOW_HASKELL__ < 709