hw-json 1.3.2.1 → 1.3.2.2
raw patch · 20 files changed
+38/−59 lines, 20 filesdep ~attoparsecdep ~bytestringdep ~dlistPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: attoparsec, bytestring, dlist, doctest, generic-lens, lens
API changes (from Hackage documentation)
Files
- app/App/Commands.hs +2/−0
- app/App/Commands/Count.hs +1/−4
- app/App/Commands/CreateIndex.hs +2/−2
- app/App/Commands/Demo.hs +2/−0
- bench/Main.hs +1/−1
- examples/Example4.hs +2/−0
- hw-json.cabal +4/−4
- src/HaskellWorks/Data/Json/FromValue.hs +1/−2
- src/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs +2/−1
- src/HaskellWorks/Data/Json/Internal/Value.hs +0/−1
- src/HaskellWorks/Data/Json/PartialValue.hs +0/−1
- src/HaskellWorks/Data/Json/Query.hs +0/−1
- src/HaskellWorks/Data/Json/Value.hs +0/−1
- test/HaskellWorks/Data/Json/LightJsonSpec.hs +3/−5
- test/HaskellWorks/Data/Json/Simple/CursorSpec.hs +3/−5
- test/HaskellWorks/Data/Json/Standard/CursorSpec.hs +3/−5
- test/HaskellWorks/Data/Json/Standard/GenCursorTest.hs +3/−5
- test/HaskellWorks/Data/Json/Token/TokenizeSpec.hs +1/−1
- test/HaskellWorks/Data/Json/TypeSpec.hs +4/−10
- test/HaskellWorks/Data/Json/ValueSpec.hs +4/−10
app/App/Commands.hs view
@@ -6,6 +6,8 @@ import App.Commands.Demo import Options.Applicative +{- HLINT ignore "Monoid law, left identity" -}+ commands :: Parser (IO ()) commands = commandsGeneral
app/App/Commands/Count.hs view
@@ -32,10 +32,7 @@ import qualified System.IO.MMap as IO siblings :: GenericCursor BSI.ByteString CsPoppy1 (RM.RangeMin CsPoppy1) -> [GenericCursor BSI.ByteString CsPoppy1 (RM.RangeMin CsPoppy1)]-siblings c = c:cs- where cs = case nextSibling c of- Just d -> siblings d- Nothing -> []+siblings c = c:maybe [] siblings (nextSibling c) runCount :: Z.CountOptions -> IO () runCount opts = do
app/App/Commands/CreateIndex.hs view
@@ -32,8 +32,8 @@ import qualified System.IO as IO import qualified System.IO.MMap as IO -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant do" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant do" -} runCreateIndexStandard :: Z.CreateIndexOptions -> IO () runCreateIndexStandard opts = do
app/App/Commands/Demo.hs view
@@ -34,6 +34,8 @@ import qualified System.IO as IO import qualified System.IO.MMap as IO +{- HLINT ignore "Reduce duplication" -}+ runDemo :: Z.DemoOptions -> IO () runDemo opts = do let filePath = opts ^. the @"filePath"
bench/Main.hs view
@@ -6,5 +6,5 @@ main :: IO () main = do- benchmarks <- fmap mconcat $ sequence $ mempty+ benchmarks <- mconcat <$> sequence mempty defaultMain benchmarks
examples/Example4.hs view
@@ -18,6 +18,8 @@ import qualified Data.DList as DL +{- HLINT ignore "Reduce duplication" -}+ example :: IO () example = do !cursor <- loadPartial "corpus/bench/78mb.json"
hw-json.cabal view
@@ -1,7 +1,7 @@ cabal-version: 2.2 name: hw-json-version: 1.3.2.1+version: 1.3.2.2 synopsis: Memory efficient JSON parser description: Memory efficient JSON parser. Please see README.md category: Data@@ -12,7 +12,7 @@ copyright: 2016-2020 John Ky license: BSD-3-Clause license-file: LICENSE-tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4+tested-with: GHC == 8.10.2, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 build-type: Simple extra-source-files: README.md corpus/5000B.json@@ -39,7 +39,7 @@ common base { build-depends: base >= 4.11 && < 5 } -common aeson { build-depends: aeson >= 1.4.3.0 && < 1.5 }+common aeson { build-depends: aeson >= 1.4.3.0 && < 1.6 } common ansi-wl-pprint { build-depends: ansi-wl-pprint >= 0.6.8.2 && < 0.7 } common array { build-depends: array >= 0.5 && < 0.6 } common attoparsec { build-depends: attoparsec >= 0.13 && < 0.14 }@@ -67,7 +67,7 @@ common hw-simd { build-depends: hw-simd >= 0.1.1.2 && < 0.2 } common lens { build-depends: lens >= 4 && < 5 } common mmap { build-depends: mmap >= 0.5 && < 0.6 }-common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.16 }+common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.17 } common scientific { build-depends: scientific >= 0.3.6.2 && < 0.4 } common text { build-depends: text >= 1.2 && < 1.3 } common transformers { build-depends: transformers >= 0.4 && < 0.6 }
src/HaskellWorks/Data/Json/FromValue.hs view
@@ -1,5 +1,4 @@-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE TypeSynonymInstances #-}+{-# LANGUAGE FlexibleInstances #-} module HaskellWorks.Data.Json.FromValue where
src/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs view
@@ -2,7 +2,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-}-{-# LANGUAGE TypeSynonymInstances #-} module HaskellWorks.Data.Json.Internal.Standard.Token.Tokenize ( IsChar(..)@@ -24,6 +23,8 @@ import qualified Data.Attoparsec.Types as T import qualified Data.ByteString as BS import qualified HaskellWorks.Data.Parser as P++{- HLINT ignore "Reduce duplication" -} hexDigitNumeric :: P.Parser t u => T.Parser t Int hexDigitNumeric = do
src/HaskellWorks/Data/Json/Internal/Value.hs view
@@ -1,6 +1,5 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-}
src/HaskellWorks/Data/Json/PartialValue.hs view
@@ -1,6 +1,5 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-}
src/HaskellWorks/Data/Json/Query.hs view
@@ -1,6 +1,5 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-}
src/HaskellWorks/Data/Json/Value.hs view
@@ -1,5 +1,4 @@ {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-}
test/HaskellWorks/Data/Json/LightJsonSpec.hs view
@@ -1,7 +1,5 @@-{-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE OverloadedStrings #-}@@ -36,9 +34,9 @@ import qualified HaskellWorks.Data.Json.Standard.Cursor.Slow as SLOW import qualified HaskellWorks.Data.TreeCursor as TC -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}-{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant bracket" -}+{- HLINT ignore "Redundant do" -} fc = TC.firstChild ns = TC.nextSibling
test/HaskellWorks/Data/Json/Simple/CursorSpec.hs view
@@ -1,7 +1,5 @@-{-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE OverloadedStrings #-}@@ -24,9 +22,9 @@ import qualified HaskellWorks.Data.Json.Simple.Value as V import qualified HaskellWorks.Data.TreeCursor as TC -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}-{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant bracket" -}+{- HLINT ignore "Redundant do" -} fc = TC.firstChild ns = TC.nextSibling
test/HaskellWorks/Data/Json/Standard/CursorSpec.hs view
@@ -1,7 +1,5 @@-{-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE OverloadedStrings #-}@@ -17,9 +15,9 @@ import qualified HaskellWorks.Data.Json.Standard.Cursor.Fast as FAST import qualified HaskellWorks.Data.Json.Standard.Cursor.Slow as SLOW -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}-{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant bracket" -}+{- HLINT ignore "Redundant do" -} spec :: Spec spec = describe "HaskellWorks.Data.Json.Succinct.CursorSpec" $ do
test/HaskellWorks/Data/Json/Standard/GenCursorTest.hs view
@@ -1,7 +1,5 @@-{-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE OverloadedStrings #-}@@ -28,9 +26,9 @@ import qualified Data.ByteString as BS import qualified HaskellWorks.Data.TreeCursor as TC -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}-{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant bracket" -}+{- HLINT ignore "Redundant do" -} fc = TC.firstChild ns = TC.nextSibling
test/HaskellWorks/Data/Json/Token/TokenizeSpec.hs view
@@ -10,7 +10,7 @@ import qualified Data.Attoparsec.ByteString.Char8 as BC -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}+{- HLINT ignore "Redundant do" -} parseJsonToken' :: ByteString -> Either String (JsonToken String Double) parseJsonToken' = BC.parseOnly parseJsonToken
test/HaskellWorks/Data/Json/TypeSpec.hs view
@@ -1,7 +1,5 @@-{-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE OverloadedStrings #-}@@ -28,9 +26,9 @@ import qualified HaskellWorks.Data.Json.Standard.Cursor.Slow as SLOW import qualified HaskellWorks.Data.TreeCursor as TC -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}-{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant bracket" -}+{- HLINT ignore "Redundant do" -} fc = TC.firstChild ns = TC.nextSibling@@ -41,11 +39,7 @@ genSpec "CsPoppy" FAST.fromString genSpec :: forall t u.- ( Eq t- , Show t- , Select1 t- , Eq u- , Show u+ ( Select1 t , Rank0 u , Rank1 u , BalancedParens u
test/HaskellWorks/Data/Json/ValueSpec.hs view
@@ -1,7 +1,5 @@-{-# LANGUAGE ExplicitForAll #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE OverloadedStrings #-}@@ -30,9 +28,9 @@ import qualified HaskellWorks.Data.Json.Standard.Cursor.Slow as SLOW import qualified HaskellWorks.Data.TreeCursor as TC -{-# ANN module ("HLint: ignore Redundant do" :: String) #-}-{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-}-{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-}+{- HLINT ignore "Reduce duplication" -}+{- HLINT ignore "Redundant bracket" -}+{- HLINT ignore "Redundant do" -} fc = TC.firstChild ns = TC.nextSibling@@ -54,11 +52,7 @@ Nothing -> Left (DecodeError "No such element") genSpec :: forall t u.- ( Eq t- , Show t- , Select1 t- , Eq u- , Show u+ ( Select1 t , Rank0 u , Rank1 u , BalancedParens u