From 65cee2db70a204bfc381497840a5752f0c00ba61 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Thu, 31 Aug 2023 18:44:05 +0700 Subject: [PATCH] Require `bytestring <= 0.11` --- package.yaml | 2 +- sensei.cabal | 10 +++++----- src/ReadHandle.hs | 9 --------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/package.yaml b/package.yaml index 042984a..17acf3b 100644 --- a/package.yaml +++ b/package.yaml @@ -35,7 +35,7 @@ dependencies: - ansi-terminal - directory - http-client >= 0.5.0 - - bytestring + - bytestring >= 0.11 - filepath - unix - async diff --git a/sensei.cabal b/sensei.cabal index f6ae42d..a890e19 100644 --- a/sensei.cabal +++ b/sensei.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.2. +-- This file has been generated from package.yaml by hpack version 0.35.4. -- -- see: https://github.com/sol/hpack @@ -58,7 +58,7 @@ executable seito , ansi-terminal , async , base >=4.11 && <5 - , bytestring + , bytestring >=0.11 , casing , containers , directory @@ -116,7 +116,7 @@ executable sensei , ansi-terminal , async , base >=4.11 && <5 - , bytestring + , bytestring >=0.11 , casing , containers , directory @@ -174,7 +174,7 @@ executable sensei-web , ansi-terminal , async , base >=4.11 && <5 - , bytestring + , bytestring >=0.11 , casing , containers , directory @@ -251,7 +251,7 @@ test-suite spec , ansi-terminal , async , base >=4.11 && <5 - , bytestring + , bytestring >=0.11 , casing , containers , directory diff --git a/src/ReadHandle.hs b/src/ReadHandle.hs index ba36bf0..7755b70 100644 --- a/src/ReadHandle.hs +++ b/src/ReadHandle.hs @@ -16,16 +16,7 @@ import qualified Data.ByteString.Char8 as B import Data.IORef import System.IO hiding (stdin, stdout, stderr, isEOF) -#if MIN_VERSION_bytestring(0,11,0) import Data.ByteString (dropEnd) -#else -import qualified Data.ByteString.Internal as B -dropEnd :: Int -> ByteString -> ByteString -dropEnd n ps@(B.PS x offset len) - | n <= 0 = ps - | n >= len = B.empty - | otherwise = B.PS x offset (len - n) -#endif -- | Truly random marker, used to separate expressions. --