Skip to content

Commit 535dfe5

Browse files
newhoggynewhoggy
committed
Update dependencies
1 parent f3e21bb commit 535dfe5

File tree

12 files changed

+65
-59
lines changed

12 files changed

+65
-59
lines changed

‎hw-json.cabal‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ executable hw-json-example
4040
, hw-mquery >= 0.1.0.0
4141
, hw-parser
4242
, hw-prim >= 0.3.0.5
43-
, hw-rankselect >= 0.4.0.0
43+
, hw-rankselect >= 0.5.0.0
44+
, hw-rankselect-base >= 0.1.0.0
4445
, mmap
4546
, mono-traversable
4647
, resourcet
@@ -91,7 +92,8 @@ library
9192
, hw-mquery >= 0.1.0.0
9293
, hw-parser
9394
, hw-prim >= 0.3.0.5
94-
, hw-rankselect >= 0.4.0.0
95+
, hw-rankselect >= 0.5.0.0
96+
, hw-rankselect-base >= 0.1.0.0
9597
, mmap
9698
, mono-traversable
9799
, resourcet
@@ -123,7 +125,8 @@ test-suite hw-json-test
123125
, hw-conduit
124126
, hw-json
125127
, hw-prim >= 0.3.0.5
126-
, hw-rankselect >= 0.0.0.5
128+
, hw-rankselect >= 0.5.0.0
129+
, hw-rankselect-base >= 0.1.0.0
127130
, mmap
128131
, parsec
129132
, QuickCheck
@@ -151,7 +154,8 @@ benchmark bench
151154
, hw-conduit
152155
, hw-json
153156
, hw-prim >= 0.3.0.5
154-
, hw-rankselect >= 0.0.0.5
157+
, hw-rankselect >= 0.5.0.0
158+
, hw-rankselect-base >= 0.1.0.0
155159
, mmap
156160
, resourcet
157161
, vector

‎packages.list‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
hw-bits
22
hw-conduit
33
hw-diagnostics
4+
hw-excess
45
hw-mquery
56
hw-parser
67
hw-prim
78
hw-rankselect
9+
hw-rankselect-base
810
hw-string-parse

‎src/HaskellWorks/Data/Json/LightJson.hs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
module HaskellWorks.Data.Json.LightJson where
1111

1212
import Control.Arrow
13-
import qualified Data.Attoparsec.ByteString.Char8 as ABC
14-
import qualified Data.ByteString.Char8 as BSC
15-
import qualified Data.ByteString as BS
16-
import qualified Data.DList as DL
17-
import qualified Data.List as L
13+
import qualified Data.Attoparsec.ByteString.Char8 as ABC
14+
import qualified Data.ByteString.Char8 as BSC
15+
import qualified Data.ByteString as BS
16+
import qualified Data.DList as DL
17+
import qualified Data.List as L
1818
import Data.String
1919
import Data.Word
2020
import Data.Word8
@@ -29,11 +29,11 @@ import HaskellWorks.Data.Micro
2929
import HaskellWorks.Data.Mini
3030
import HaskellWorks.Data.MQuery
3131
import HaskellWorks.Data.Positioning
32+
import HaskellWorks.Data.RankSelect.Base.Rank0
33+
import HaskellWorks.Data.RankSelect.Base.Rank1
34+
import HaskellWorks.Data.RankSelect.Base.Select1
3235
import HaskellWorks.Data.Row
33-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
34-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
35-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
36-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
36+
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
3737
import HaskellWorks.Data.TreeCursor
3838
import HaskellWorks.Data.Uncons
3939
import Prelude hiding (drop)

‎src/HaskellWorks/Data/Json/PartialValue.hs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ module HaskellWorks.Data.Json.PartialValue
2222
) where
2323

2424
import Control.Arrow
25-
import qualified Data.Attoparsec.ByteString.Char8 as ABC
26-
import qualified Data.ByteString as BS
27-
import qualified Data.DList as DL
25+
import qualified Data.Attoparsec.ByteString.Char8 as ABC
26+
import qualified Data.ByteString as BS
27+
import qualified Data.DList as DL
2828
import HaskellWorks.Data.AtLeastSize
2929
import HaskellWorks.Data.Bits.BitWise
3030
import HaskellWorks.Data.Entry
@@ -34,11 +34,11 @@ import HaskellWorks.Data.MQuery
3434
import HaskellWorks.Data.Json.Succinct.Cursor
3535
import HaskellWorks.Data.Json.Succinct.PartialIndex
3636
import HaskellWorks.Data.Json.Value.Internal
37-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
38-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
39-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
40-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
37+
import HaskellWorks.Data.RankSelect.Base.Rank0
38+
import HaskellWorks.Data.RankSelect.Base.Rank1
39+
import HaskellWorks.Data.RankSelect.Base.Select1
4140
import HaskellWorks.Data.Row
41+
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
4242
import Text.PrettyPrint.ANSI.Leijen
4343

4444
data JsonPartialValue

‎src/HaskellWorks/Data/Json/Succinct/Cursor/Internal.hs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ module HaskellWorks.Data.Json.Succinct.Cursor.Internal
99
, jsonCursorPos
1010
) where
1111

12-
import qualified Data.ByteString as BS
13-
import qualified Data.ByteString.Char8 as BSC
14-
import Data.ByteString.Internal as BSI
12+
import qualified Data.ByteString as BS
13+
import qualified Data.ByteString.Char8 as BSC
14+
import Data.ByteString.Internal as BSI
1515
import Data.String
16-
import qualified Data.Vector.Storable as DVS
16+
import qualified Data.Vector.Storable as DVS
1717
import Data.Word
1818
import Foreign.ForeignPtr
1919
import HaskellWorks.Data.Bits.BitShown
2020
import HaskellWorks.Data.FromByteString
2121
import HaskellWorks.Data.FromForeignRegion
22-
import qualified HaskellWorks.Data.Json.Succinct.Cursor.BalancedParens as CBP
22+
import qualified HaskellWorks.Data.Json.Succinct.Cursor.BalancedParens as CBP
2323
import HaskellWorks.Data.Json.Succinct.Cursor.BlankedJson
2424
import HaskellWorks.Data.Json.Succinct.Cursor.InterestBits
2525
import HaskellWorks.Data.Positioning
26-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
27-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
28-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
29-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
26+
import HaskellWorks.Data.RankSelect.Base.Rank0
27+
import HaskellWorks.Data.RankSelect.Base.Rank1
28+
import HaskellWorks.Data.RankSelect.Base.Select1
29+
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
3030
import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512
3131
import HaskellWorks.Data.TreeCursor
3232

‎src/HaskellWorks/Data/Json/Succinct/Cursor/Token.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ module HaskellWorks.Data.Json.Succinct.Cursor.Token
33
( jsonTokenAt
44
) where
55

6-
import qualified Data.Attoparsec.ByteString.Char8 as ABC
7-
import Data.ByteString.Internal as BSI
6+
import qualified Data.Attoparsec.ByteString.Char8 as ABC
7+
import Data.ByteString.Internal as BSI
88
import HaskellWorks.Data.Bits.BitWise
99
import HaskellWorks.Data.Drop
1010
import HaskellWorks.Data.Json.Succinct.Cursor.Internal
1111
import HaskellWorks.Data.Json.Token.Tokenize
1212
import HaskellWorks.Data.Positioning
13-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
14-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
13+
import HaskellWorks.Data.RankSelect.Base.Rank1
14+
import HaskellWorks.Data.RankSelect.Base.Select1
1515
import Prelude hiding (drop)
1616

1717
jsonTokenAt :: (Rank1 w, Select1 v, TestBit w) => JsonCursor ByteString v w -> Maybe (JsonToken String Double)

‎src/HaskellWorks/Data/Json/Succinct/Index.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ module HaskellWorks.Data.Json.Succinct.Index where
88

99
import Control.Arrow
1010
import Control.Monad
11-
import qualified Data.ByteString as BS
12-
import qualified Data.List as L
11+
import qualified Data.ByteString as BS
12+
import qualified Data.List as L
1313
import HaskellWorks.Data.Bits.BitWise
1414
import HaskellWorks.Data.Decode
1515
import HaskellWorks.Data.Drop
1616
import HaskellWorks.Data.Json.CharLike
1717
import HaskellWorks.Data.Json.Succinct
1818
import HaskellWorks.Data.Positioning
19-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
20-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
21-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
22-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
19+
import HaskellWorks.Data.RankSelect.Base.Rank0
20+
import HaskellWorks.Data.RankSelect.Base.Rank1
21+
import HaskellWorks.Data.RankSelect.Base.Select1
22+
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
2323
import HaskellWorks.Data.TreeCursor
2424
import HaskellWorks.Data.Uncons
2525
import Prelude hiding (drop)

‎src/HaskellWorks/Data/Json/Succinct/PartialIndex.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
module HaskellWorks.Data.Json.Succinct.PartialIndex where
99

1010
import Control.Arrow
11-
import qualified Data.ByteString as BS
12-
import qualified Data.List as L
11+
import qualified Data.ByteString as BS
12+
import qualified Data.List as L
1313
import HaskellWorks.Data.Bits.BitWise
1414
import HaskellWorks.Data.Drop
1515
import HaskellWorks.Data.Json.CharLike
1616
import HaskellWorks.Data.Json.Succinct
1717
import HaskellWorks.Data.Positioning
18-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
19-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
20-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
21-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
18+
import HaskellWorks.Data.RankSelect.Base.Rank0
19+
import HaskellWorks.Data.RankSelect.Base.Rank1
20+
import HaskellWorks.Data.RankSelect.Base.Select1
21+
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
2222
import HaskellWorks.Data.TreeCursor
2323
import HaskellWorks.Data.Uncons
2424
import Prelude hiding (drop)

‎src/HaskellWorks/Data/Json/Type.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ module HaskellWorks.Data.Json.Type
77
, JsonTypeAt(..)
88
) where
99

10-
import qualified Data.ByteString as BS
10+
import qualified Data.ByteString as BS
1111
import Data.Char
1212
import Data.Word8
1313
import HaskellWorks.Data.Bits.BitWise
1414
import HaskellWorks.Data.Drop
1515
import HaskellWorks.Data.Json.Succinct
1616
import HaskellWorks.Data.Positioning
17-
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
18-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
19-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
20-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
17+
import HaskellWorks.Data.RankSelect.Base.Rank0
18+
import HaskellWorks.Data.RankSelect.Base.Rank1
19+
import HaskellWorks.Data.RankSelect.Base.Select1
20+
import qualified HaskellWorks.Data.Succinct.BalancedParens as BP
2121
import Prelude hiding (drop)
2222

2323
{-# ANN module ("HLint: Reduce duplication" :: String) #-}

‎test/HaskellWorks/Data/Json/Succinct/CursorSpec.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import HaskellWorks.Data.FromForeignRegion
2323
import HaskellWorks.Data.Json.Succinct.Cursor as C
2424
import HaskellWorks.Data.Json.Succinct.Index
2525
import HaskellWorks.Data.Json.Token
26+
import HaskellWorks.Data.RankSelect.Base.Rank0
27+
import HaskellWorks.Data.RankSelect.Base.Rank1
28+
import HaskellWorks.Data.RankSelect.Base.Select1
2629
import HaskellWorks.Data.Succinct.BalancedParens.BalancedParens
2730
import HaskellWorks.Data.Succinct.BalancedParens.Simple
28-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank0
29-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Rank1
30-
import HaskellWorks.Data.Succinct.RankSelect.Binary.Basic.Select1
3131
import HaskellWorks.Data.Succinct.RankSelect.Binary.Poppy512
3232
import qualified HaskellWorks.Data.TreeCursor as TC
3333
import Test.Hspec

0 commit comments

Comments
 (0)