~ Use older bytestings.

4 files changed, 35 insertions, 33 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 5f57a5e9..fbd045f4 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -8,7 +8,8 @@ copyright:             (c) 2013, Sam T.
 category:              Network
 build-type:            Simple
 cabal-version:         >= 1.8
-tested-with:           GHC==7.4.1
+tested-with:           GHC == 7.4.1
+                     , GHC == 7.6.3
 homepage:              https://github.com/pxqr/bittorrent
 bug-reports:           https://github.com/pxqr/bittorrent/issues
 synopsis:              Bittorrent protocol implementation.
@@ -42,16 +43,16 @@ library
                      , Network.BitTorrent.Exchange
 
   other-modules:       Network.BitTorrent.Internal
-                     , System.IO.MMap.Fixed
 
   if flag(testing)
      exposed-modules:  Network.BitTorrent.Exchange.Protocol
                      , Network.BitTorrent.Tracker.Protocol
+                     , System.IO.MMap.Fixed
 
   if !flag(testing)
-     other-modules:
-                       Network.BitTorrent.Exchange.Protocol
+     other-modules:    Network.BitTorrent.Exchange.Protocol
                      , Network.BitTorrent.Tracker.Protocol
+                     , System.IO.MMap.Fixed
 
 
   build-depends:
@@ -69,29 +70,29 @@ library
                      , stm         >= 2.4
 
                        -- Conduits
-                     , conduit          == 1.*
-                     , network-conduit  == 1.*
+                     , conduit          >= 1.0
+                     , network-conduit  >= 1.0
                      , cereal-conduit   >= 0.5
 
                        -- Data
-                     , array      >= 0.4
-                     , bytestring >= 0.10
+                     , array       >= 0.4
+                     , bytestring  >= 0.10.0.0
 
                      , containers  >= 0.4
                      , intset      >= 0.1
                      , IntervalMap >= 0.3
 
-                     , text       >= 0.11.0
+                     , text        >= 0.11.0
                      , vector
 
                        -- Encoding/Serialization
-                     , bencoding  >= 0.1
-                     , cereal     >= 0.3
-                     , urlencoded >= 0.4
+                     , bencoding   >= 0.1.0.1
+                     , cereal      >= 0.3
+                     , urlencoded  >= 0.4
 
                        -- Time
-                     , time       >= 0.1
-                     , old-locale >= 1.0
+                     , time        >= 0.1
+                     , old-locale  >= 1.0
 
                        -- Network
                      , network    >= 2.4
@@ -107,7 +108,7 @@ library
                      , cryptohash
                      , pretty
 
-                     , bits-atomic >= 0.1
+--                     , bits-atomic >= 0.1
 
   extensions:          PatternGuards
   hs-source-dirs:      src
@@ -139,11 +140,10 @@ test-suite info-hash
   main-is:             InfoHash.hs
   hs-source-dirs:      tests
 
-  build-depends:       base       == 4.*
+  build-depends:       base
                      , bytestring
- -- >= 0.10.2.0
-                     , containers >= 0.4.2.1
-                     , bencoding  >= 0.1.0.0
+                     , containers
+                     , bencoding
                      , bittorrent
                      , Diff
 
@@ -157,7 +157,8 @@ test-suite info-hash
 test-suite mmap
   type:                exitcode-stdio-1.0
   main-is:             MMap.hs
-  build-depends:       base        == 4.*
+  build-depends:       base
+                     , bittorrent
                      , bytestring
                      , directory
 
@@ -165,21 +166,22 @@ test-suite mmap
                      , test-framework
                      , test-framework-hunit
 
-                     , mmap-fixed
-
   hs-source-dirs:      tests
 
+  if !flag(testing)
+     buildable:        False
+
 
 
 test-suite properties
   type:                exitcode-stdio-1.0
   main-is:             Main.hs
   hs-source-dirs:      tests
-  build-depends:       base       == 4.*
+  build-depends:       base == 4.*
                      , bytestring
--- >= 0.10.2
-                     , cereal     >= 0.3.5.2
-                     , network    >= 2.4.0.13
+
+                     , cereal
+                     , network
                      , text
 
                      , test-framework
@@ -201,7 +203,7 @@ benchmark benchmarks
   main-is:             Main.hs
   hs-source-dirs:      bench
 
-  build-depends:       base == 4.*
+  build-depends:       base
                      , bytestring
                      , cereal
                      , network
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 1af8ece2..368ec77c 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -65,9 +65,9 @@ import qualified Data.Map as M
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC (pack, unpack)
-import qualified Data.ByteString.Builder as B
-import qualified Data.ByteString.Builder.Prim as B
 import qualified Data.ByteString.Lazy as Lazy
+import qualified Data.ByteString.Lazy.Builder as B
+import qualified Data.ByteString.Lazy.Builder.ASCII as B
 import qualified Data.List as L
 import           Data.Text (Text)
 import           Data.Serialize as S hiding (Result)
@@ -401,10 +401,10 @@ hashlazy = InfoHash . C.hashlazy
 
 -- | Pretty print info hash in hexadecimal format.
 ppInfoHash :: InfoHash -> Doc
-ppInfoHash = text . BC.unpack . Lazy.toStrict . ppHex . getInfoHash
+ppInfoHash = text . BC.unpack . ppHex . getInfoHash
 
-ppHex :: ByteString -> Lazy.ByteString
-ppHex = B.toLazyByteString . foldMap (B.primFixed B.word8HexFixed) . B.unpack
+ppHex :: ByteString -> ByteString
+ppHex = Lazy.toStrict . B.toLazyByteString . B.byteStringHexFixed
 
 -- | Add query info hash parameter to uri.
 --
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 41630c6d..80f47eac 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -77,7 +77,7 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC
 import qualified Data.ByteString.Lazy as BL
-import qualified Data.ByteString.Builder as B
+import qualified Data.ByteString.Lazy.Builder as B
 import Data.Foldable    (foldMap)
 import Data.Monoid      ((<>))
 import Data.Serialize
diff --git a/sub/bencoding b/sub/bencoding
-Subproject 1cd16efea0b982cac9f8ee4d0917bc12ba91b46
+Subproject 027333ccd04d3627c1fbebdf5d3b736c5d84865