Skip to content

Commit 9ab6cc1

Browse files
newhoggynewhoggy
authored
Merge pull request #46 from haskell-works/update-dependencies
Update to hw-balancedparens-0.3.0.0
2 parents 9840e09 + 8df92a3 commit 9ab6cc1

File tree

4 files changed

+41
-36
lines changed

4 files changed

+41
-36
lines changed

‎app/Main.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ module Main where
77

88
import Data.Foldable
99
import Data.Maybe
10-
import Data.Semigroup ((<>))
10+
import Data.Semigroup ((<>))
1111
import Data.Word
12-
import HaskellWorks.Data.BalancedParens.RangeMinMax2
12+
import HaskellWorks.Data.BalancedParens.RangeMin2
1313
import HaskellWorks.Data.BalancedParens.Simple
1414
import HaskellWorks.Data.Bits.BitShown
1515
import HaskellWorks.Data.FromByteString
@@ -27,7 +27,7 @@ import qualified Data.ByteString as BS
2727
import qualified Data.Vector.Storable as DVS
2828

2929
type RawCursor = XmlCursor BS.ByteString (BitShown (DVS.Vector Word64)) (SimpleBalancedParens (DVS.Vector Word64))
30-
type FastCursor = XmlCursor BS.ByteString CsPoppy (RangeMinMax2 CsPoppy)
30+
type FastCursor = XmlCursor BS.ByteString CsPoppy (RangeMin2 CsPoppy)
3131

3232
-- | Read an XML file into memory and return a raw cursor initialised to the
3333
-- start of the XML document.
@@ -47,7 +47,7 @@ readFastCursor filename = do
4747
-- re-parsing the file.
4848
XmlCursor !text (BitShown !ib) (SimpleBalancedParens !bp) _ <- readRawCursor filename
4949
let !bpCsPoppy = makeCsPoppy bp
50-
let !rangeMinMax = mkRangeMinMax2 bpCsPoppy
50+
let !rangeMinMax = mkRangeMin2 bpCsPoppy
5151
let !ibCsPoppy = makeCsPoppy ib
5252
return $ XmlCursor text ibCsPoppy rangeMinMax 1
5353

‎cabal.project

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
with-compiler: ghc-8.6.3
2-
31
packages: .

‎cabal.project.local

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
package *
3+
ghc-location: ghc
4+
5+
program-locations
6+
ghc-location: ghc

‎hw-xml.cabal

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,34 @@ source-repository head
2525

2626
common base { build-depends: base >= 4.7 && < 5 }
2727

28-
common QuickCheck { build-depends: QuickCheck }
29-
common ansi-wl-pprint { build-depends: ansi-wl-pprint }
30-
common array { build-depends: array }
31-
common attoparsec { build-depends: attoparsec }
32-
common bytestring { build-depends: bytestring }
33-
common cereal { build-depends: cereal }
34-
common conduit { build-depends: conduit }
35-
common containers { build-depends: containers }
36-
common criterion { build-depends: criterion }
37-
common deepseq { build-depends: deepseq }
38-
common ghc-prim { build-depends: ghc-prim }
39-
common hspec { build-depends: hspec }
40-
common hw-balancedparens { build-depends: hw-balancedparens >= 0.2.0.1 }
41-
common hw-bits { build-depends: hw-bits >= 0.7.0.2 }
42-
common hw-conduit { build-depends: hw-conduit >= 0.2.0.2 }
43-
common hw-parser { build-depends: hw-parser }
44-
common hw-prim { build-depends: hw-prim >= 0.4.0.0 }
45-
common hw-rankselect { build-depends: hw-rankselect >= 0.10.0.3 }
46-
common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.2.0.0 }
47-
common hw-xml { build-depends: hw-xml }
48-
common lens { build-depends: lens }
49-
common mmap { build-depends: mmap }
50-
common mtl { build-depends: mtl }
51-
common resourcet { build-depends: resourcet }
52-
common transformers { build-depends: transformers }
53-
common vector { build-depends: vector }
54-
common word8 { build-depends: word8 }
28+
common QuickCheck { build-depends: QuickCheck >= 2.13.1 && < 3 }
29+
common ansi-wl-pprint { build-depends: ansi-wl-pprint >= 0.6.9 && < 0.7 }
30+
common array { build-depends: array >= 0.5.2.0 && < 0.6 }
31+
common attoparsec { build-depends: attoparsec >= 0.13.2.2 && < 0.14 }
32+
common bytestring { build-depends: bytestring >= 0.10.8.2 && < 0.11 }
33+
common cereal { build-depends: cereal >= 0.5.8.1 && < 0.6 }
34+
common conduit { build-depends: conduit >= 1.3.1.1 && < 1.4 }
35+
common containers { build-depends: containers >= 0.6.2.1 && < 0.7 }
36+
common criterion { build-depends: criterion >= 1.5.5.0 && < 1.6 }
37+
common deepseq { build-depends: deepseq >= 1.4.3.0 && < 1.5 }
38+
common ghc-prim { build-depends: ghc-prim >= 0.5 && < 0.6 }
39+
common hedgehog { build-depends: hedgehog >= 1.0 && < 1.1 }
40+
common hspec { build-depends: hspec >= 2.5 && < 3.0 }
41+
common hw-balancedparens { build-depends: hw-balancedparens >= 0.3.0.0 && < 0.4 }
42+
common hw-bits { build-depends: hw-bits >= 0.7.0.6 && < 0.8 }
43+
common hw-conduit { build-depends: hw-conduit >= 0.2.0.5 && < 0.3 }
44+
common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1 && < 0.2 }
45+
common hw-parser { build-depends: hw-parser >= 0.1.0.1 && < 0.2 }
46+
common hw-prim { build-depends: hw-prim >= 0.6.2.28 && < 0.7 }
47+
common hw-rankselect { build-depends: hw-rankselect >= 0.13.1.0 && < 0.14 }
48+
common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.3.2.1 && < 0.4 }
49+
common lens { build-depends: lens >= 4.17.1 && < 5.0 }
50+
common mmap { build-depends: mmap >= 0.5.9 && < 0.6 }
51+
common mtl { build-depends: mtl >= 2.2.2 && < 3 }
52+
common resourcet { build-depends: resourcet >= 1.2.2 && < 1.3 }
53+
common transformers { build-depends: transformers >= 0.5.5.0 && < 0.6 }
54+
common vector { build-depends: vector >= 0.12.0.3 && < 0.13 }
55+
common word8 { build-depends: word8 >= 0.1.3 && < 0.2 }
5556

5657
common config
5758
default-language: Haskell2010
@@ -121,11 +122,11 @@ executable hw-xml-example
121122
, hw-bits
122123
, hw-prim
123124
, hw-rankselect
124-
, hw-xml
125125
, vector
126126
main-is: Main.hs
127127
other-modules: Paths_hw_xml
128128
autogen-modules: Paths_hw_xml
129+
build-depends: hw-xml
129130
hs-source-dirs: app
130131
ghc-options: -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -msse4.2
131132

@@ -143,11 +144,11 @@ test-suite hw-xml-test
143144
, hw-prim
144145
, hw-rankselect
145146
, hw-rankselect-base
146-
, hw-xml
147147
, vector
148148
type: exitcode-stdio-1.0
149149
main-is: Spec.hs
150150
hs-source-dirs: test
151+
build-depends: hw-xml
151152
ghc-options: -threaded -rtsopts -with-rtsopts=-N
152153
default-language: Haskell2010
153154
build-tool-depends: hspec-discover:hspec-discover
@@ -171,13 +172,13 @@ benchmark bench
171172
, hw-bits
172173
, hw-conduit
173174
, hw-prim
174-
, hw-xml
175175
, mmap
176176
, resourcet
177177
, vector
178178
type: exitcode-stdio-1.0
179179
main-is: Main.hs
180180
other-modules: Paths_hw_xml
181+
build-depends: hw-xml
181182
autogen-modules: Paths_hw_xml
182183
hs-source-dirs: bench
183184
ghc-options: -O2 -Wall -msse4.2

0 commit comments

Comments
 (0)