Permalink
Browse files

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

Make compatible with upcoming Prelude.<> export in GHC 8.4/base-4.11
  • Loading branch information...
2 parents a760167 + 2c644d5 commit 445e92dd7508978caba5563c1e79b2758dff4767 @dterei dterei committed Sep 21, 2017
View
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit 445e92d

Please sign in to comment.