Merge pull request #912 from haskell/bytestring-0.11.2.0

Add bytestring-0.11.2.0 constraint set

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.13.20211111
+# version: 0.13.20211116
 #
-# REGENDATA ("0.13.20211111",["github","cabal.project"])
+# REGENDATA ("0.13.20211116",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -233,6 +233,10 @@ jobs:
       - name: prepare for constraint sets
         run: |
           rm -f cabal.project.local
+      - name: constraint set bytestring-0.11.2.0
+        run: |
+          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='bytestring >= 0.11.2.0' --dependencies-only -j2 all
+          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='bytestring >= 0.11.2.0' all
       - name: constraint set ordered-keymap-off
         run: |
           $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson -ordered-keymap' --dependencies-only -j2 all

attoparsec-iso8601/attoparsec-iso8601.cabal

@@ -1,5 +1,5 @@
 name:            attoparsec-iso8601
-version:         1.0.2.1
+version:         1.0.2.2
 synopsis:        Parsing of ISO 8601 dates, originally from aeson.
 description:     Parsing of ISO 8601 dates, originally from aeson.
 license:         BSD3

attoparsec-iso8601/changelog.md

@@ -1,5 +1,9 @@
 For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md](https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md).
 
+### 1.0.2.2
+
+* Avoid wild imports
+
 ### 1.0.2.1
 
 * Code (re)organization.

attoparsec-iso8601/src/Data/Attoparsec/Time.hs

@@ -27,7 +27,7 @@ import Prelude.Compat
 
 import Control.Applicative ((<|>))
 import Control.Monad (void, when)
-import Data.Attoparsec.Text as A
+import Data.Attoparsec.Text (Parser, char, decimal, digit, option, anyChar, peekChar, peekChar', takeWhile1, satisfy)
 import Data.Attoparsec.Time.Internal (toPico)
 import Data.Bits ((.&.))
 import Data.Char (isDigit, ord)

attoparsec-iso8601/src/Data/Attoparsec/Time/Internal.hs

@@ -21,7 +21,7 @@ import Prelude.Compat
 import Data.Fixed (Fixed(MkFixed), Pico)
 import Data.Int (Int64)
 import Data.Time (TimeOfDay(..))
-import Data.Time.Clock.Compat
+import Data.Time.Clock.Compat (DiffTime, diffTimeToPicoseconds)
 
 toPico :: Integer -> Pico
 toPico = MkFixed

cabal.haskell-ci

@@ -22,3 +22,6 @@ constraint-set ordered-keymap-off
   constraints: aeson -ordered-keymap
   tests:       True
   run-tests:   True
+
+constraint-set bytestring-0.11.2.0
+  constraints: bytestring >= 0.11.2.0

src/Data/Aeson/Encoding/Builder.hs

@@ -44,8 +44,10 @@ import Data.Aeson.Internal.Time
 import Data.Aeson.Types.Internal (Value (..), Key)
 import qualified Data.Aeson.Key as Key
 import qualified Data.Aeson.KeyMap as KM
-import Data.ByteString.Builder as B
-import Data.ByteString.Builder.Prim as BP
+import Data.ByteString.Builder (Builder)
+import qualified Data.ByteString.Builder as B
+import Data.ByteString.Builder.Prim ((>$<), (>*<))
+import qualified Data.ByteString.Builder.Prim as BP
 import Data.ByteString.Builder.Scientific (scientificBuilder)
 import Data.Char (chr, ord)
 import Data.Scientific (Scientific, base10Exponent, coefficient)
@@ -54,7 +56,7 @@ import Data.Time (UTCTime(..))
 import Data.Time.Calendar (Day(..), toGregorian)
 import Data.Time.Calendar.Month.Compat (Month, toYearMonth)
 import Data.Time.Calendar.Quarter.Compat (Quarter, toYearQuarter, QuarterOfYear (..))
-import Data.Time.LocalTime
+import Data.Time.LocalTime (LocalTime (..), TimeZone (..), ZonedTime (..), TimeOfDay (..))
 import Data.Word (Word8)
 import qualified Data.Text as T
 import qualified Data.Vector as V

src/Data/Aeson/Encoding/Internal.hs

@@ -68,14 +68,14 @@ import Data.Aeson.Types.Internal (Value, Key)
 import Data.ByteString.Builder (Builder, char7, toLazyByteString)
 import Data.ByteString.Short (ShortByteString)
 import qualified Data.Aeson.Key as Key
-import Data.Int
+import Data.Int (Int8, Int16, Int32, Int64)
 import Data.Scientific (Scientific)
 import Data.Text (Text)
 import Data.Time (Day, LocalTime, TimeOfDay, UTCTime, ZonedTime)
 import Data.Time.Calendar.Month.Compat (Month)
 import Data.Time.Calendar.Quarter.Compat (Quarter)
 import Data.Typeable (Typeable)
-import Data.Word
+import Data.Word (Word8, Word16, Word32, Word64)
 import qualified Data.Aeson.Encoding.Builder as EB
 import qualified Data.ByteString.Builder as B
 import qualified Data.ByteString.Lazy as BSL

src/Data/Aeson/Text.hs

@@ -28,7 +28,8 @@ import Data.Aeson.Types (Value(..), ToJSON(..))
 import Data.Aeson.Encoding (encodingToLazyByteString)
 import qualified Data.Aeson.KeyMap as KM
 import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
-import Data.Text.Lazy.Builder
+import Data.Text.Lazy.Builder (Builder)
+import qualified Data.Text.Lazy.Builder as TB
 import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)
 import Numeric (showHex)
 import qualified Data.Aeson.Key as Key
@@ -62,23 +63,23 @@ encodeToTextBuilder =
     go (Array v)
         | V.null v = {-# SCC "go/Array" #-} "[]"
         | otherwise = {-# SCC "go/Array" #-}
-                      singleton '[' <>
+                      TB.singleton '[' <>
                       go (V.unsafeHead v) <>
-                      V.foldr f (singleton ']') (V.unsafeTail v)
-      where f a z = singleton ',' <> go a <> z
+                      V.foldr f (TB.singleton ']') (V.unsafeTail v)
+      where f a z = TB.singleton ',' <> go a <> z
     go (Object m) = {-# SCC "go/Object" #-}
         case KM.toList m of
-          (x:xs) -> singleton '{' <> one x <> foldr f (singleton '}') xs
+          (x:xs) -> TB.singleton '{' <> one x <> foldr f (TB.singleton '}') xs
           _      -> "{}"
-      where f a z     = singleton ',' <> one a <> z
-            one (k,v) = string (Key.toText k) <> singleton ':' <> go v
+      where f a z     = TB.singleton ',' <> one a <> z
+            one (k,v) = string (Key.toText k) <> TB.singleton ':' <> go v
 
 string :: T.Text -> Builder
-string s = {-# SCC "string" #-} singleton '"' <> quote s <> singleton '"'
+string s = {-# SCC "string" #-} TB.singleton '"' <> quote s <> TB.singleton '"'
   where
     quote q = case T.uncons t of
-                Nothing      -> fromText h
-                Just (!c,t') -> fromText h <> escape c <> quote t'
+                Nothing      -> TB.fromText h
+                Just (!c,t') -> TB.fromText h <> escape c <> quote t'
         where (h,t) = {-# SCC "break" #-} T.break isEscape q
     isEscape c = c == '\"' ||
                  c == '\\' ||
@@ -90,8 +91,8 @@ string s = {-# SCC "string" #-} singleton '"' <> quote s <> singleton '"'
     escape '\t' = "\\t"
 
     escape c
-        | c < '\x20' = fromString $ "\\u" ++ replicate (4 - length h) '0' ++ h
-        | otherwise  = singleton c
+        | c < '\x20' = TB.fromString $ "\\u" ++ replicate (4 - length h) '0' ++ h
+        | otherwise  = TB.singleton c
         where h = showHex (fromEnum c) ""
 
 fromScientific :: Scientific -> Builder