diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # hw-packed-vector -[![CircleCI](https://circleci.com/gh/haskell-works/hw-packed-vector.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-packed-vector) +[![Binaries](https://github.com/haskell-works/hw-packed-vector/actions/workflows/haskell.yml/badge.svg)](https://github.com/haskell-works/hw-packed-vector/actions/workflows/haskell.yml) A vector that stores words of equal size between 1 to 64 inclusive in memory contiguously with efficient lookup. diff --git a/app/App/Commands/CreateIndex.hs b/app/App/Commands/CreateIndex.hs --- a/app/App/Commands/CreateIndex.hs +++ b/app/App/Commands/CreateIndex.hs @@ -19,8 +19,8 @@ import qualified System.Exit as IO import qualified System.IO as IO -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Reduce duplication" -} +{- HLINT ignore "Redundant do" -} decodeWord32s :: LBS.ByteString -> [Word32] decodeWord32s = fmap (G.runGet G.getWord32le) . go diff --git a/hw-packed-vector.cabal b/hw-packed-vector.cabal --- a/hw-packed-vector.cabal +++ b/hw-packed-vector.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: hw-packed-vector -version: 0.2.1.0 +version: 0.2.1.1 synopsis: Packed Vector description: Packed Vector. Please see README.md category: Data, Vector @@ -10,10 +10,10 @@ bug-reports: https://github.com/haskell-works/hw-packed-vector/issues author: John Ky maintainer: newhoggy@gmail.com -copyright: 2016-2020 John Ky +copyright: 2016-2021 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 == 9.2.2, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4, GHC == 8.6.5 build-type: Simple extra-source-files: README.md @@ -24,26 +24,28 @@ common base { build-depends: base >= 4.11 && < 5 } common binary { build-depends: binary >= 0.8 && < 0.9 } -common bytestring { build-depends: bytestring >= 0.10.8.2 && < 0.11 } -common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } +common bytestring { build-depends: bytestring >= 0.10.8.2 && < 0.12 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.21 } common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } common criterion { build-depends: criterion >= 1.4.1.0 && < 1.6 } common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } common directory { build-depends: directory >= 1.3 && < 1.4 } -common generic-lens { build-depends: generic-lens >= 1.1.0.0 && < 1.3 } -common hedgehog { build-depends: hedgehog >= 0.6 && < 1.1 } +common generic-lens { build-depends: generic-lens >= 1.1.0.0 && < 2.3 } +common hedgehog { build-depends: hedgehog >= 0.6 && < 1.2 } common hspec { build-depends: hspec >= 2.7.1 && < 3 } common hw-bits { build-depends: hw-bits >= 0.7.0.6 && < 0.8 } common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.3 && < 0.2 } common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.7 && < 0.2 } common hw-prim { build-depends: hw-prim >= 0.6.2.27 && < 0.7 } -common lens { build-depends: lens >= 4 && < 5 } -common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.16 } +common lens { build-depends: lens >= 4 && < 6 } +common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.18 } common vector { build-depends: vector >= 0.12.0.3 && < 0.13 } common config default-language: Haskell2010 - ghc-options: -Wall -O2 -msse4.2 + ghc-options: -Wall -O2 + if arch(x86_64) + ghc-options: -msse4.2 common hw-packed-vector build-depends: hw-packed-vector @@ -121,7 +123,7 @@ , hw-packed-vector default-language: Haskell2010 type: exitcode-stdio-1.0 - ghc-options: -threaded + ghc-options: -threaded -rtsopts -with-rtsopts=-N main-is: DoctestDriver.hs HS-Source-Dirs: doctest build-tool-depends: doctest-discover:doctest-discover diff --git a/src/HaskellWorks/Data/PackedVector/Internal.hs b/src/HaskellWorks/Data/PackedVector/Internal.hs --- a/src/HaskellWorks/Data/PackedVector/Internal.hs +++ b/src/HaskellWorks/Data/PackedVector/Internal.hs @@ -5,13 +5,13 @@ , unpackBits' ) where -import Data.Word -import HaskellWorks.Data.Bits.BitWise -import HaskellWorks.Data.Bits.FixedBitSize -import HaskellWorks.Data.Bits.LoBitsSized -import HaskellWorks.Data.Positioning +import Data.Word +import HaskellWorks.Data.Bits.BitWise +import HaskellWorks.Data.Bits.FixedBitSize +import HaskellWorks.Data.Bits.LoBitsSized +import HaskellWorks.Data.Positioning -{-# ANN module ("HLint: Reduce duplication" :: String) #-} +{- HLINT ignore "Reduce duplication" -} class Integral a => PackBits a where packBits :: Count -> [a] -> [a] diff --git a/test/HaskellWorks/Data/PackedVector/InternalSpec.hs b/test/HaskellWorks/Data/PackedVector/InternalSpec.hs --- a/test/HaskellWorks/Data/PackedVector/InternalSpec.hs +++ b/test/HaskellWorks/Data/PackedVector/InternalSpec.hs @@ -9,7 +9,7 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.PackedVector.InternalSpec" $ do diff --git a/test/HaskellWorks/Data/PackedVector/PackedVector64Spec.hs b/test/HaskellWorks/Data/PackedVector/PackedVector64Spec.hs --- a/test/HaskellWorks/Data/PackedVector/PackedVector64Spec.hs +++ b/test/HaskellWorks/Data/PackedVector/PackedVector64Spec.hs @@ -12,7 +12,8 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.PackedVector.PackedVector64Spec" $ do