Update code to use data-msgpack-types split from data-msgpack.

TokTok · Jan 7, 2018 · 6847baf · 6847baf
1 parent c725749
commit 6847baf
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/hstox.cabal b/hstox.cabal
@@ -36,7 +36,8 @@ library
     , bytestring
     , clock                     >= 0.3
     , containers
-    , data-msgpack
+    , data-msgpack              >= 0.0.11
+    , data-msgpack-types        >= 0.0.1
     , entropy
     , integer-gmp
     , iproute

diff --git a/src/testsuite/Network/Tox/Crypto/BoxSpec.hs b/src/testsuite/Network/Tox/Crypto/BoxSpec.hs
@@ -5,7 +5,7 @@ module Network.Tox.Crypto.BoxSpec where
 
 import           Control.Monad.IO.Class         (liftIO)
 import qualified Data.ByteString                as ByteString
-import qualified Data.MessagePack.Result        as R
+import qualified Data.MessagePack.Types.Result  as R
 import           Data.Proxy                     (Proxy (..))
 import           Network.MessagePack.Rpc        (rpc)
 import           Network.Tox.RPCTest            (equiv3, equivProp, equivProp3,

diff --git a/src/testsuite/Network/Tox/Crypto/KeyPairSpec.hs b/src/testsuite/Network/Tox/Crypto/KeyPairSpec.hs
@@ -4,7 +4,7 @@ module Network.Tox.Crypto.KeyPairSpec where
 import           Control.Monad.IO.Class         (liftIO)
 import qualified Crypto.Saltine.Class           as Sodium (encode)
 import           Data.Proxy                     (Proxy (..))
-import           Network.MessagePack.Rpc        (rpc, rpc)
+import           Network.MessagePack.Rpc        (rpc)
 import           Network.Tox.RPCTest            (equivProp1, runTest)
 import           Test.Hspec
 import           Test.QuickCheck

diff --git a/src/testsuite/Network/Tox/Crypto/KeySpec.hs b/src/testsuite/Network/Tox/Crypto/KeySpec.hs
@@ -5,18 +5,18 @@ module Network.Tox.Crypto.KeySpec where
 import           Test.Hspec
 import           Test.QuickCheck
 
-import qualified Crypto.Saltine.Class     as Sodium
-import           Data.Binary              (Binary)
-import           Data.ByteString          (ByteString)
-import qualified Data.ByteString          as ByteString
-import qualified Data.MessagePack.Result  as R
-import           Data.Proxy               (Proxy (..))
-import           Data.Typeable            (Typeable)
-import qualified Network.Tox.Binary       as Binary
-import           Network.Tox.Crypto.Key   (Key (..))
-import qualified Network.Tox.Crypto.Key   as Key
+import qualified Crypto.Saltine.Class          as Sodium
+import           Data.Binary                   (Binary)
+import           Data.ByteString               (ByteString)
+import qualified Data.ByteString               as ByteString
+import qualified Data.MessagePack.Types.Result as R
+import           Data.Proxy                    (Proxy (..))
+import           Data.Typeable                 (Typeable)
+import qualified Network.Tox.Binary            as Binary
+import           Network.Tox.Crypto.Key        (Key (..))
+import qualified Network.Tox.Crypto.Key        as Key
 import           Network.Tox.EncodingSpec
-import qualified Text.Read                as Read
+import qualified Text.Read                     as Read
 
 
 readMaybe :: String -> Maybe Key.PublicKey

diff --git a/src/testsuite/Network/Tox/Crypto/NonceSpec.hs b/src/testsuite/Network/Tox/Crypto/NonceSpec.hs
@@ -2,7 +2,7 @@
 module Network.Tox.Crypto.NonceSpec where
 
 import           Control.Monad.IO.Class   (liftIO)
-import           Network.MessagePack.Rpc  (rpc, rpc)
+import           Network.MessagePack.Rpc  (rpc)
 import           Network.Tox.RPCTest      (equivProp1, runTest)
 import           Test.Hspec
 import           Test.QuickCheck

diff --git a/src/tox/Network/Tox/DHT/DhtState.lhs b/src/tox/Network/Tox/DHT/DhtState.lhs
@@ -5,7 +5,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns        #-}
 {-# LANGUAGE RankNTypes            #-}
-{-# LANGUAGE Trustworthy           #-}
+{-# LANGUAGE Safe                  #-}
 module Network.Tox.DHT.DhtState where
 
 import           Control.Applicative            (Applicative, Const (..),

diff --git a/src/tox/Network/Tox/DHT/Operation.lhs b/src/tox/Network/Tox/DHT/Operation.lhs
@@ -7,8 +7,8 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns        #-}
 {-# LANGUAGE RankNTypes            #-}
+{-# LANGUAGE Safe                  #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE Trustworthy           #-}
 {-# LANGUAGE TypeSynonymInstances  #-}
 module Network.Tox.DHT.Operation where