From aecd72fa5c88b5b6221121744e6a8813f917136b Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Mon, 18 Apr 2016 13:39:36 -0400 Subject: [PATCH] ghc 8.0 record and typeintype prelude objects --- src/Base.hs | 12 ++++++++++++ src/Protolude.hs | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/Base.hs b/src/Base.hs index 239f25d18..d3a3aeb2a 100644 --- a/src/Base.hs +++ b/src/Base.hs @@ -1,6 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE Unsafe #-} {-# LANGUAGE BangPatterns #-} +{-# LANGUAGE ExplicitNamespaces #-} {-# LANGUAGE NoImplicitPrelude #-} module Base ( @@ -50,6 +51,17 @@ import GHC.Types as X ( #endif ) +#if ( __GLASGOW_HASKELL__ >= 800 ) +import GHC.OverloadedLabels as X ( + IsLabel(..) + ) + +import Data.Kind as X ( + type (*) + , type Type + ) +#endif + infixr 0 $! ($!) :: (a -> b) -> a -> b diff --git a/src/Protolude.hs b/src/Protolude.hs index 97a731aa2..282838d93 100644 --- a/src/Protolude.hs +++ b/src/Protolude.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE Trustworthy #-} {-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE ExplicitNamespaces #-} +{-# LANGUAGE ExplicitNamespaces #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} module Protolude ( @@ -84,6 +84,10 @@ import Data.Foldable as X hiding ( import Data.Semiring as X import Data.Functor.Identity as X +#if ( __GLASGOW_HASKELL__ >= 800 ) +import Data.Semigroup as X ( Semigroup(..) ) +#endif + #if (__GLASGOW_HASKELL__ >= 710) import Data.Bifunctor as X (Bifunctor(..)) #else @@ -143,7 +147,11 @@ import Data.Proxy as X ( ) import Data.Typeable as X ( - TypeRep, + TypeRep + , Typeable + , typeRep + , cast + , eqT ) import Data.Type.Coercion as X ( @@ -250,6 +258,9 @@ import GHC.Generics ( , Constructor(..) , Selector(..) , Fixity(..) +#if ( __GLASGOW_HASKELL__ >= 800 ) + , Meta(..) +#endif ) -- ByteString