# HG changeset patch # User unc0rr # Date 1467220589 -10800 # Node ID 8f730ba4ca3c180ebe9f0303c1a483e30025a80f # Parent c05e8453206a13ab651bcd99a6656e0f59f08408 bytestring-show RIP diff -r c05e8453206a -r 8f730ba4ca3c gameServer/CMakeLists.txt --- a/gameServer/CMakeLists.txt Wed Jun 22 09:25:29 2016 -0400 +++ b/gameServer/CMakeLists.txt Wed Jun 29 20:16:29 2016 +0300 @@ -9,7 +9,6 @@ check_haskell_module_exists("Data.Map" size 1 containers) check_haskell_module_exists("Data.Vector" length 1 vector) check_haskell_module_exists("Data.ByteString" pack 1 bytestring) -check_haskell_module_exists("Text.Show.ByteString" putDigit 1 bytestring-show) check_haskell_module_exists("Network.BSD" getHostName 0 network) check_haskell_module_exists("Data.Time" getCurrentTime 0 time) check_haskell_module_exists("Control.Monad.State" fix 1 mtl) diff -r c05e8453206a -r 8f730ba4ca3c gameServer/Utils.hs --- a/gameServer/Utils.hs Wed Jun 22 09:25:29 2016 -0400 +++ b/gameServer/Utils.hs Wed Jun 29 20:16:29 2016 +0300 @@ -29,7 +29,6 @@ import qualified Data.List as List import Control.Monad import qualified Data.ByteString.Lazy as BL -import qualified Text.Show.ByteString as BS import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.UTF8 as UTF8 import Data.Maybe @@ -132,8 +131,8 @@ Right (a, new_b) -> let (a', b') = unfoldrE f new_b in (a : a', b') Left new_b -> ([], new_b) -showB :: (BS.Show a) => a -> B.ByteString -showB = B.concat . BL.toChunks . BS.show +showB :: (Show a) => a -> B.ByteString +showB = B.pack . show readInt_ :: (Num a) => B.ByteString -> a readInt_ str = diff -r c05e8453206a -r 8f730ba4ca3c gameServer/hedgewars-server.cabal --- a/gameServer/hedgewars-server.cabal Wed Jun 22 09:25:29 2016 -0400 +++ b/gameServer/hedgewars-server.cabal Wed Jun 29 20:16:29 2016 +0300 @@ -21,7 +21,6 @@ containers, vector, bytestring, - bytestring-show, network >= 2.3, random, time,