Require text>=2.0.2 to eliminate CPP

Author: Bodigrim

Cabal-syntax/Cabal-syntax.cabal

@@ -39,7 +39,7 @@ library
     , mtl        >= 2.1      && < 2.4
     , parsec     >= 3.1.13.0 && < 3.2
     , pretty     >= 1.1.1    && < 1.2
-    , text       (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2)
+    , text       >= 2.0.2    && < 2.2
     , time       >= 1.4.0.1  && < 1.16
     -- transformers-0.4.0.0 doesn't have record syntax e.g. for Identity
     -- See also https://github.com/ekmett/transformers-compat/issues/35

Cabal-syntax/src/Distribution/Parsec/FieldLineStream.hs

@@ -18,13 +18,8 @@ import Distribution.Utils.Generic (toUTF8BS)
 import Prelude ()
 
 import qualified Data.ByteString as BS
-import qualified Text.Parsec as Parsec
-
-#if MIN_VERSION_text(2,0,0)
 import Data.Text.Internal.Encoding.Utf8
-#else
-import Data.Bits
-#endif
+import qualified Text.Parsec as Parsec
 
 -- | This is essentially a lazy bytestring, but chunks are glued with newline @\'\\n\'@.
 data FieldLineStream
@@ -53,7 +48,6 @@ instance Monad m => Parsec.Stream FieldLineStream m Char where
     Nothing -> Just ('\n', s)
     Just (c, bs') -> Just (unconsChar c bs' (\bs'' -> FLSCons bs'' s) s)
 
-#if MIN_VERSION_text(2,0,0)
 unconsChar :: forall a. Word8 -> ByteString -> (ByteString -> a) -> a -> (Char, a)
 unconsChar c0 bs0 f next = go (utf8DecodeStart c0) bs0
   where
@@ -63,49 +57,6 @@ unconsChar c0 bs0 f next = go (utf8DecodeStart c0) bs0
       Incomplete state codePoint -> case BS.uncons bs of
         Nothing -> (replacementChar, next)
         Just (w, bs') -> go (utf8DecodeContinue w state codePoint) bs'
-#else
--- Based on implementation 'decodeStringUtf8'
-unconsChar :: forall a. Word8 -> ByteString -> (ByteString -> a) -> a -> (Char, a)
-unconsChar c0 bs0 f next
-  | c0 <= 0x7F = (chr (fromIntegral c0), f bs0)
-  | c0 <= 0xBF = (replacementChar, f bs0)
-  | c0 <= 0xDF = twoBytes
-  | c0 <= 0xEF = moreBytes 3 0x800 bs0 (fromIntegral $ c0 .&. 0xF)
-  | c0 <= 0xF7 = moreBytes 4 0x10000 bs0 (fromIntegral $ c0 .&. 0x7)
-  | c0 <= 0xFB = moreBytes 5 0x200000 bs0 (fromIntegral $ c0 .&. 0x3)
-  | c0 <= 0xFD = moreBytes 6 0x4000000 bs0 (fromIntegral $ c0 .&. 0x1)
-  | otherwise = error $ "not implemented " ++ show c0
-  where
-    twoBytes = case BS.uncons bs0 of
-      Nothing -> (replacementChar, next)
-      Just (c1, bs1)
-        | c1 .&. 0xC0 == 0x80 ->
-            if d >= 0x80
-              then (chr d, f bs1)
-              else (replacementChar, f bs1)
-        | otherwise -> (replacementChar, f bs1)
-        where
-          d = (fromIntegral (c0 .&. 0x1F) `shiftL` 6) .|. fromIntegral (c1 .&. 0x3F)
-
-    moreBytes :: Int -> Int -> ByteString -> Int -> (Char, a)
-    moreBytes 1 overlong bs' acc
-      | overlong <= acc
-      , acc <= 0x10FFFF
-      , acc < 0xD800 || 0xDFFF < acc =
-          (chr acc, f bs')
-      | otherwise =
-          (replacementChar, f bs')
-    moreBytes byteCount overlong bs' acc = case BS.uncons bs' of
-      Nothing -> (replacementChar, f bs')
-      Just (cn, bs1)
-        | cn .&. 0xC0 == 0x80 ->
-            moreBytes
-              (byteCount - 1)
-              overlong
-              bs1
-              ((acc `shiftL` 6) .|. fromIntegral cn .&. 0x3F)
-        | otherwise -> (replacementChar, f bs1)
-#endif
 
 replacementChar :: Char
 replacementChar = '\xfffd'

bootstrap/linux-9.2.8.json

@@ -70,7 +70,7 @@
         },
         {
             "package": "text",
-            "version": "1.2.5.0"
+            "version": "2.0.2"
         },
         {
             "package": "parsec",