diff --git a/app/App/Commands.hs b/app/App/Commands.hs --- a/app/App/Commands.hs +++ b/app/App/Commands.hs @@ -4,7 +4,6 @@ import App.Commands.SelectAll import App.Commands.UnitTest import App.Commands.Validate -import Data.Monoid ((<>)) import Options.Applicative cmdOpts :: Parser (IO ()) diff --git a/app/App/Commands/Build.hs b/app/App/Commands/Build.hs --- a/app/App/Commands/Build.hs +++ b/app/App/Commands/Build.hs @@ -10,7 +10,6 @@ import Control.Monad import Data.Generics.Product.Any import Data.List -import Data.Monoid ((<>)) import HaskellWorks.Data.FromForeignRegion import Options.Applicative import System.Directory diff --git a/app/App/Commands/SelectAll.hs b/app/App/Commands/SelectAll.hs --- a/app/App/Commands/SelectAll.hs +++ b/app/App/Commands/SelectAll.hs @@ -11,7 +11,6 @@ import Control.Monad import Data.Generics.Product.Any import Data.List -import Data.Monoid ((<>)) import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.FromForeignRegion import HaskellWorks.Data.RankSelect.Base.Select1 diff --git a/app/App/Commands/UnitTest.hs b/app/App/Commands/UnitTest.hs --- a/app/App/Commands/UnitTest.hs +++ b/app/App/Commands/UnitTest.hs @@ -10,7 +10,6 @@ import Control.Lens import Control.Monad import Data.Generics.Product.Any -import Data.Monoid ((<>)) import Data.Word import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.RankSelect.Base.Select1 diff --git a/app/App/Commands/Validate.hs b/app/App/Commands/Validate.hs --- a/app/App/Commands/Validate.hs +++ b/app/App/Commands/Validate.hs @@ -11,7 +11,6 @@ import Control.Monad import Control.Monad.State import Data.Generics.Product.Any -import Data.Monoid ((<>)) import Data.Word import HaskellWorks.Data.AtIndex import HaskellWorks.Data.Bits.PopCount.PopCount1 diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -6,7 +6,6 @@ import App.Commands import Control.Monad import Data.List -import Data.Monoid ((<>)) import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.FromForeignRegion import HaskellWorks.Data.RankSelect.Base.Select1 diff --git a/bench/Main.hs b/bench/Main.hs --- a/bench/Main.hs +++ b/bench/Main.hs @@ -6,7 +6,6 @@ import Control.Monad import Criterion.Main import Data.List -import Data.Monoid ((<>)) import Data.Word import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.FromForeignRegion diff --git a/hw-rankselect.cabal b/hw-rankselect.cabal --- a/hw-rankselect.cabal +++ b/hw-rankselect.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: hw-rankselect -version: 0.13.3.2 +version: 0.13.4.0 synopsis: Rank-select description: Please see README.md category: Data, Bit, Succinct Data Structures, Data Structures @@ -9,10 +9,10 @@ bug-reports: https://github.com/haskell-works/hw-rankselect/issues author: John Ky maintainer: newhoggy@gmail.com -copyright: 2016-2019 John Ky +copyright: 2016-2020 John Ky license: BSD-3-Clause license-file: LICENSE -tested-with: GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2 +tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 build-type: Simple extra-source-files: README.md data/README.md @@ -27,33 +27,33 @@ manual: False default: False -common base { build-depends: base >= 4.10 && < 5 } +common base { build-depends: base >= 4.11 && < 5 } -common QuickCheck { build-depends: QuickCheck >= 2.10 && < 2.14 } -common bytestring { build-depends: bytestring >= 0.10 && < 0.11 } -common conduit { build-depends: conduit >= 1.2 && < 1.4 } -common criterion { build-depends: criterion >= 1.1 && < 1.6 } -common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } -common directory { build-depends: directory >= 1.2 && < 1.5 } -common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } -common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } -common generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 1.3 } -common hedgehog { build-depends: hedgehog >= 1.0 && < 1.1 } -common hspec { build-depends: hspec >= 2.4 && < 3 } -common hw-balancedparens { build-depends: hw-balancedparens >= 0.2.2.0 && < 0.4 } -common hw-bits { build-depends: hw-bits >= 0.4.0.0 && < 0.8 } -common hw-fingertree { build-depends: hw-fingertree >= 0.1.1.0 && < 1.2 } -common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 } -common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1 && < 0.2 } -common hw-prim { build-depends: hw-prim >= 0.6.2.23 && < 0.7 } -common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.2.0.0 && < 0.4 } -common lens { build-depends: lens >= 4 && < 5 } -common mmap { build-depends: mmap >= 0.5 && < 0.6 } -common mtl { build-depends: mtl >= 2.2 && < 2.3 } -common optparse-applicative { build-depends: optparse-applicative >= 0.11 && < 0.16 } -common resourcet { build-depends: resourcet >= 1.1 && < 1.3 } -common transformers { build-depends: transformers >= 0.4 && < 0.6 } -common vector { build-depends: vector >= 0.12 && < 0.13 } +common QuickCheck { build-depends: QuickCheck >= 2.10 && < 2.15 } +common bytestring { build-depends: bytestring >= 0.10 && < 0.11 } +common conduit { build-depends: conduit >= 1.2 && < 1.4 } +common criterion { build-depends: criterion >= 1.1 && < 1.6 } +common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } +common directory { build-depends: directory >= 1.2 && < 1.5 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } +common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } +common generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 2.1 } +common hedgehog { build-depends: hedgehog >= 1.0 && < 1.1 } +common hspec { build-depends: hspec >= 2.4 && < 3 } +common hw-balancedparens { build-depends: hw-balancedparens >= 0.2.2.0 && < 0.4 } +common hw-bits { build-depends: hw-bits >= 0.4.0.0 && < 0.8 } +common hw-fingertree { build-depends: hw-fingertree >= 0.1.1.0 && < 1.2 } +common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 } +common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1 && < 0.2 } +common hw-prim { build-depends: hw-prim >= 0.6.2.23 && < 0.7 } +common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.2.0.0 && < 0.4 } +common lens { build-depends: lens >= 4 && < 5 } +common mmap { build-depends: mmap >= 0.5 && < 0.6 } +common mtl { build-depends: mtl >= 2.2 && < 2.3 } +common optparse-applicative { build-depends: optparse-applicative >= 0.11 && < 0.16 } +common resourcet { build-depends: resourcet >= 1.1 && < 1.3 } +common transformers { build-depends: transformers >= 0.4 && < 0.6 } +common vector { build-depends: vector >= 0.12 && < 0.13 } common config default-language: Haskell2010 diff --git a/src/HaskellWorks/Data/RankSelect/BitSeq.hs b/src/HaskellWorks/Data/RankSelect/BitSeq.hs --- a/src/HaskellWorks/Data/RankSelect/BitSeq.hs +++ b/src/HaskellWorks/Data/RankSelect/BitSeq.hs @@ -20,7 +20,6 @@ import Data.Coerce import Data.Foldable -import Data.Monoid import Data.Word import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.FingerTree (ViewL (..), ViewR (..), (<|), (><), (|>)) diff --git a/src/HaskellWorks/Data/RankSelect/CsPoppy/Internal/Nice.hs b/src/HaskellWorks/Data/RankSelect/CsPoppy/Internal/Nice.hs --- a/src/HaskellWorks/Data/RankSelect/CsPoppy/Internal/Nice.hs +++ b/src/HaskellWorks/Data/RankSelect/CsPoppy/Internal/Nice.hs @@ -2,7 +2,6 @@ module HaskellWorks.Data.RankSelect.CsPoppy.Internal.Nice where -import Data.Semigroup ((<>)) import HaskellWorks.Data.Bits.BitShow import HaskellWorks.Data.RankSelect.CsPoppy import HaskellWorks.Data.RankSelect.CsPoppy.Internal.CsInterleaved diff --git a/src/HaskellWorks/Data/RankSelect/Internal/BitSeq.hs b/src/HaskellWorks/Data/RankSelect/Internal/BitSeq.hs --- a/src/HaskellWorks/Data/RankSelect/Internal/BitSeq.hs +++ b/src/HaskellWorks/Data/RankSelect/Internal/BitSeq.hs @@ -20,8 +20,6 @@ ) where import Control.DeepSeq -import Data.Monoid (Monoid) -import Data.Semigroup (Semigroup (..)) import Data.Word import GHC.Generics import HaskellWorks.Data.Bits.BitWise diff --git a/test/HaskellWorks/Data/RankSelect/BitSeqSpec.hs b/test/HaskellWorks/Data/RankSelect/BitSeqSpec.hs --- a/test/HaskellWorks/Data/RankSelect/BitSeqSpec.hs +++ b/test/HaskellWorks/Data/RankSelect/BitSeqSpec.hs @@ -4,7 +4,6 @@ module HaskellWorks.Data.RankSelect.BitSeqSpec where -import Data.Semigroup ((<>)) import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.RankSelect.Base.Rank1 import HaskellWorks.Data.RankSelect.Base.Select1 diff --git a/test/HaskellWorks/Data/RankSelect/CsPoppySpec.hs b/test/HaskellWorks/Data/RankSelect/CsPoppySpec.hs --- a/test/HaskellWorks/Data/RankSelect/CsPoppySpec.hs +++ b/test/HaskellWorks/Data/RankSelect/CsPoppySpec.hs @@ -10,7 +10,6 @@ import Control.Monad.IO.Class import Data.Function import Data.Maybe -import Data.Monoid ((<>)) import Data.Word import GHC.Exts import HaskellWorks.Data.AtIndex diff --git a/test/HaskellWorks/Data/RankSelect/ValidateSpec.hs b/test/HaskellWorks/Data/RankSelect/ValidateSpec.hs --- a/test/HaskellWorks/Data/RankSelect/ValidateSpec.hs +++ b/test/HaskellWorks/Data/RankSelect/ValidateSpec.hs @@ -6,7 +6,6 @@ import Control.Monad import Control.Monad.IO.Class import Data.List (isSuffixOf) -import Data.Monoid ((<>)) import Data.Word import HaskellWorks.Data.AtIndex import HaskellWorks.Data.Bits.PopCount.PopCount1