Merge pull request #47 from haskell-works/switch-from-CsPoppy-to-CsPoppy1

Switch from CsPoppy to CsPoppy1

Author: newhoggy

app/Main.hs

@@ -13,7 +13,7 @@ import HaskellWorks.Data.BalancedParens.RangeMin2
 import HaskellWorks.Data.BalancedParens.Simple
 import HaskellWorks.Data.Bits.BitShown
 import HaskellWorks.Data.FromByteString
-import HaskellWorks.Data.RankSelect.CsPoppy
+import HaskellWorks.Data.RankSelect.CsPoppy1
 import HaskellWorks.Data.TreeCursor
 import HaskellWorks.Data.Xml.Decode
 import HaskellWorks.Data.Xml.DecodeResult
@@ -27,7 +27,7 @@ import qualified Data.ByteString      as BS
 import qualified Data.Vector.Storable as DVS
 
 type RawCursor = XmlCursor BS.ByteString (BitShown (DVS.Vector Word64)) (SimpleBalancedParens (DVS.Vector Word64))
-type FastCursor = XmlCursor BS.ByteString CsPoppy (RangeMin2 CsPoppy)
+type FastCursor = XmlCursor BS.ByteString CsPoppy1 (RangeMin2 CsPoppy1)
 
 -- | Read an XML file into memory and return a raw cursor initialised to the
 -- start of the XML document.

hw-xml.cabal

@@ -44,7 +44,7 @@ common hw-conduit                 { build-depends: hw-conduit                 >=
 common hw-hspec-hedgehog          { build-depends: hw-hspec-hedgehog          >= 0.1        && < 0.2    }
 common hw-parser                  { build-depends: hw-parser                  >= 0.1.0.1    && < 0.2    }
 common hw-prim                    { build-depends: hw-prim                    >= 0.6.2.28   && < 0.7    }
-common hw-rankselect              { build-depends: hw-rankselect              >= 0.13.1.0   && < 0.14   }
+common hw-rankselect              { build-depends: hw-rankselect              >= 0.13.2.0   && < 0.14   }
 common hw-rankselect-base         { build-depends: hw-rankselect-base         >= 0.3.2.1    && < 0.4    }
 common lens                       { build-depends: lens                       >= 4.17.1     && < 5.0    }
 common mmap                       { build-depends: mmap                       >= 0.5.9      && < 0.6    }

src/HaskellWorks/Data/Xml/RawValue.hs

@@ -10,7 +10,7 @@ module HaskellWorks.Data.Xml.RawValue
   ) where
 
 import Data.List
-import Data.Monoid
+import Data.Semigroup                       ((<>))
 import HaskellWorks.Data.Xml.Grammar
 import HaskellWorks.Data.Xml.Succinct.Index
 import Text.PrettyPrint.ANSI.Leijen         hiding ((<$>), (<>))