Merge pull request haskell-distributed#314 from bgamari/master

facundominguez · web-flow · commit eba4a4245ecc · 2017-08-29T21:08:05.000-03:00
Allow binary 0.9 and GHC 8.2
diff --git a/distributed-process.cabal b/distributed-process.cabal
@@ -42,7 +42,7 @@ flag old-locale
 
 Library
   Build-Depends:     base >= 4.6 && < 5,
-                     binary >= 0.6.3 && < 0.9,
+                     binary >= 0.6.3 && < 0.10,
                      hashable >= 1.2.0.5 && < 1.3,
                      network-transport >= 0.4.1.0 && < 0.6,
                      stm >= 2.4 && < 2.5,
@@ -123,7 +123,7 @@ benchmark distributed-process-throughput
                    distributed-process,
                    network-transport-tcp >= 0.3 && < 0.7,
                    bytestring >= 0.9 && < 0.11,
-                   binary >= 0.6.3 && < 0.9
+                   binary >= 0.6.3 && < 0.10
   Main-Is:         benchmarks/Throughput.hs
   ghc-options:     -Wall
 
@@ -133,7 +133,7 @@ benchmark distributed-process-latency
                    distributed-process,
                    network-transport-tcp >= 0.3 && < 0.7,
                    bytestring >= 0.9 && < 0.11,
-                   binary >= 0.6.3 && < 0.9
+                   binary >= 0.6.3 && < 0.10
   Main-Is:         benchmarks/Latency.hs
   ghc-options:     -Wall
 
@@ -143,7 +143,7 @@ benchmark distributed-process-channels
                    distributed-process,
                    network-transport-tcp >= 0.3 && < 0.7,
                    bytestring >= 0.9 && < 0.11,
-                   binary >= 0.6.3 && < 0.9
+                   binary >= 0.6.3 && < 0.10
   Main-Is:         benchmarks/Channels.hs
   ghc-options:     -Wall
 
@@ -153,7 +153,7 @@ benchmark distributed-process-spawns
                    distributed-process,
                    network-transport-tcp >= 0.3 && < 0.7,
                    bytestring >= 0.9 && < 0.11,
-                   binary >= 0.6.3 && < 0.9
+                   binary >= 0.6.3 && < 0.10
   Main-Is:         benchmarks/Spawns.hs
   ghc-options:     -Wall
 
@@ -163,6 +163,6 @@ benchmark distributed-process-ring
                    distributed-process,
                    network-transport-tcp >= 0.3 && < 0.7,
                    bytestring >= 0.9 && < 0.11,
-                   binary >= 0.6.3 && < 0.9
+                   binary >= 0.6.3 && < 0.10
   Main-Is:         benchmarks/ProcessRing.hs
   ghc-options:     -Wall -threaded -O2 -rtsopts
diff --git a/src/Control/Distributed/Process/Serializable.hs b/src/Control/Distributed/Process/Serializable.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 {-# LANGUAGE FlexibleInstances  #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE GADTs  #-}
 {-# LANGUAGE CPP    #-}
 module Control.Distributed.Process.Serializable
@@ -17,7 +18,11 @@ module Control.Distributed.Process.Serializable
 
 import Data.Binary (Binary)
 
-#if MIN_VERSION_base(4,7,0)
+#if MIN_VERSION_base(4,10,0)
+import Data.Typeable (Typeable)
+import Type.Reflection (typeRep)
+import Type.Reflection.Unsafe (TypeRep, typeRepFingerprint)
+#elif MIN_VERSION_base(4,7,0)
 import Data.Typeable (Typeable)
 import Data.Typeable.Internal (TypeRep(TypeRep), typeOf)
 #else
@@ -70,8 +75,10 @@ sizeOfFingerprint :: Int
 sizeOfFingerprint = sizeOf (undefined :: Fingerprint)
 
 -- | The fingerprint of the typeRep of the argument
-fingerprint :: Typeable a => a -> Fingerprint
-#if MIN_VERSION_base(4,8,0)
+fingerprint :: forall a. Typeable a => a -> Fingerprint
+#if MIN_VERSION_base(4,10,0)
+fingerprint _ = typeRepFingerprint (typeRep :: TypeRep a)
+#elif MIN_VERSION_base(4,8,0)
 fingerprint a = let TypeRep fp _ _ _ = typeOf a in fp
 #else
 fingerprint a = let TypeRep fp _ _ = typeOf a in fp
