[commit: ghc] wip/ttypeable: Bump base to 4.10.0 (75646c4)
git at git.haskell.org
git at git.haskell.org
Sat Oct 1 21:35:00 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/ttypeable
Link : http://ghc.haskell.org/trac/ghc/changeset/75646c4928df091d8df5ef3de2da9ad0dbfd793b/ghc
>---------------------------------------------------------------
commit 75646c4928df091d8df5ef3de2da9ad0dbfd793b
Author: Ben Gamari <ben at smart-cactus.org>
Date: Fri May 20 16:53:57 2016 +0200
Bump base to 4.10.0
>---------------------------------------------------------------
75646c4928df091d8df5ef3de2da9ad0dbfd793b
compiler/utils/Binary.hs | 6 +++---
libraries/base/base.cabal | 2 +-
libraries/base/tests/dynamic002.hs | 2 +-
libraries/ghc-boot/GHC/Serialized.hs | 2 +-
libraries/ghci/GHCi/Message.hs | 2 +-
libraries/ghci/GHCi/TH/Binary.hs | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs
index 23b90f5..41abb0d 100644
--- a/compiler/utils/Binary.hs
+++ b/compiler/utils/Binary.hs
@@ -78,7 +78,7 @@ import qualified Data.ByteString.Unsafe as BS
import Data.IORef
import Data.Char ( ord, chr )
import Data.Time
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
import Type.Reflection
import Type.Reflection.Unsafe
import Data.Kind (Type)
@@ -583,13 +583,13 @@ instance Binary TyCon where
p <- get bh
m <- get bh
n <- get bh
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
return (mkTyCon p m n)
#else
return (mkTyCon3 p m n)
#endif
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
putTypeRep :: BinHandle -> TypeRep a -> IO ()
-- Special handling for Type, (->), and RuntimeRep due to recursive kind
-- relations.
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index e8899fb..45b152b 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -1,5 +1,5 @@
name: base
-version: 4.9.0.0
+version: 4.10.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
diff --git a/libraries/base/tests/dynamic002.hs b/libraries/base/tests/dynamic002.hs
index fff14ec..560c4b4 100644
--- a/libraries/base/tests/dynamic002.hs
+++ b/libraries/base/tests/dynamic002.hs
@@ -4,7 +4,7 @@
module Main(main) where
import Data.Dynamic
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
import Data.Typeable (TypeCon, TypeRep)
#endif
import Data.Array
diff --git a/libraries/ghc-boot/GHC/Serialized.hs b/libraries/ghc-boot/GHC/Serialized.hs
index 8653049..42a9604 100644
--- a/libraries/ghc-boot/GHC/Serialized.hs
+++ b/libraries/ghc-boot/GHC/Serialized.hs
@@ -36,7 +36,7 @@ toSerialized serialize what = Serialized rep (serialize what)
-- | If the 'Serialized' value contains something of the given type, then use the specified deserializer to return @Just@ that.
-- Otherwise return @Nothing at .
fromSerialized :: forall a. Typeable a => ([Word8] -> a) -> Serialized -> Maybe a
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
fromSerialized deserialize (Serialized the_type bytes)
| the_type == rep = Just (deserialize bytes)
| otherwise = Nothing
diff --git a/libraries/ghci/GHCi/Message.hs b/libraries/ghci/GHCi/Message.hs
index b5558be..3eaab62 100644
--- a/libraries/ghci/GHCi/Message.hs
+++ b/libraries/ghci/GHCi/Message.hs
@@ -37,7 +37,7 @@ import Data.ByteString (ByteString)
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as LB
import Data.Dynamic
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
-- Previously this was re-exported by Data.Dynamic
import Data.Typeable (TypeRep)
#endif
diff --git a/libraries/ghci/GHCi/TH/Binary.hs b/libraries/ghci/GHCi/TH/Binary.hs
index c351cd1..c60b513 100644
--- a/libraries/ghci/GHCi/TH/Binary.hs
+++ b/libraries/ghci/GHCi/TH/Binary.hs
@@ -10,7 +10,7 @@ module GHCi.TH.Binary () where
import Data.Binary
import qualified Data.ByteString as B
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
import Type.Reflection
import Type.Reflection.Unsafe
import Data.Kind (Type)
@@ -77,7 +77,7 @@ instance Binary TH.PatSynArgs
-- We need Binary TypeRep for serializing annotations
-#if MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,10,0)
instance Binary TyCon where
put tc = put (tyConPackage tc) >> put (tyConModule tc) >> put (tyConName tc)
get = mkTyCon <$> get <*> get <*> get
More information about the ghc-commits
mailing list