From 3e9687acbf9b0467c3714cd9cf16332ebb48b729 Mon Sep 17 00:00:00 2001 From: unc0rr Date: Wed, 29 Jun 2016 20:16:29 +0300 Subject: [PATCH] [PATCH] bytestring-show RIP Gbp-Pq: Name dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch --- gameServer/CMakeLists.txt | 1 - gameServer/Utils.hs | 5 ++--- gameServer/hedgewars-server.cabal | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gameServer/CMakeLists.txt b/gameServer/CMakeLists.txt index 43bcf23..0616258 100644 --- a/gameServer/CMakeLists.txt +++ b/gameServer/CMakeLists.txt @@ -9,7 +9,6 @@ check_haskell_module_exists("Control.Exception" mask 1 base) 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 --git a/gameServer/Utils.hs b/gameServer/Utils.hs index b24ca72..be8f755 100644 --- a/gameServer/Utils.hs +++ b/gameServer/Utils.hs @@ -29,7 +29,6 @@ import System.IO 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 @@ -130,8 +129,8 @@ unfoldrE f b = 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 --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal index 98e45de..8acebe0 100644 --- a/gameServer/hedgewars-server.cabal +++ b/gameServer/hedgewars-server.cabal @@ -21,7 +21,6 @@ Executable hedgewars-server containers, vector, bytestring, - bytestring-show, network >= 2.3, random, time, -- 2.30.2