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 @@ -9,32 +9,32 @@ import Control.Lens import Control.Monad import Data.Generics.Product.Any -import Data.List import HaskellWorks.Data.FromForeignRegion import Options.Applicative import System.Directory import qualified App.Commands.Options.Type as Z +import qualified Data.List as L import qualified HaskellWorks.Data.RankSelect.CsPoppy as CS import qualified HaskellWorks.Data.RankSelect.CsPoppy.Internal.Alpha1 as A1 import qualified HaskellWorks.Data.RankSelect.Poppy512 as P512 -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Redundant return" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} +{- HLINT ignore "Redundant bracket" -} runBuild :: Z.BuildOptions -> IO () runBuild opts = case opts ^. the @"indexType" of Z.CsPoppy -> do entries <- getDirectoryContents "data" - let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries + let files = ("data/" ++) <$> (".ib" `L.isSuffixOf`) `filter` entries forM_ files $ \file -> do putStrLn $ "Loading cspoppy for " <> file CS.CsPoppy !_ !_ (A1.CsPoppyIndex !_ !_) <- mmapFromForeignRegion file return () Z.Poppy512 -> do entries <- getDirectoryContents "data" - let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries + let files = ("data/" ++) <$> (".ib" `L.isSuffixOf`) `filter` entries forM_ files $ \file -> do putStrLn $ "Loading cspoppy for " <> file P512.Poppy512 !_ !_ <- mmapFromForeignRegion file 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 @@ -10,7 +10,6 @@ import Control.Lens import Control.Monad import Data.Generics.Product.Any -import Data.List import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.FromForeignRegion import HaskellWorks.Data.RankSelect.Base.Select1 @@ -20,16 +19,17 @@ import System.Directory import qualified App.Commands.Options.Type as Z +import qualified Data.List as L -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Redundant return" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} +{- HLINT ignore "Redundant bracket" -} runSelectAll :: Z.SelectAllOptions -> IO () runSelectAll opts = case opts ^. the @"indexType" of Z.CsPoppy -> do entries <- getDirectoryContents "data" - let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries + let files = ("data/" ++) <$> (".ib" `L.isSuffixOf`) `filter` entries forM_ files $ \file -> do putStrLn $ "Loading cspoppy for " <> file v :: CsPoppy <- mmapFromForeignRegion file @@ -39,7 +39,7 @@ return () Z.Poppy512 -> do entries <- getDirectoryContents "data" - let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries + let files = ("data/" ++) <$> (".ib" `L.isSuffixOf`) `filter` entries forM_ files $ \file -> do putStrLn $ "Loading cspoppy for " <> file v :: Poppy512 <- mmapFromForeignRegion file 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 @@ -21,8 +21,8 @@ import qualified HaskellWorks.Data.FromForeignRegion as IO import qualified System.IO as IO -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} runUnitTest :: Z.UnitTestOptions -> IO () runUnitTest opts = case opts ^. the @"name" of 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 @@ -24,9 +24,9 @@ import qualified HaskellWorks.Data.RankSelect.CsPoppy as CS import qualified System.IO as IO -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Redundant return" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} +{- HLINT ignore "Redundant bracket" -} runValidate :: Z.ValidateOptions -> IO () runValidate opts = case opts ^. the @"indexType" of diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -5,7 +5,6 @@ import App.Commands import Control.Monad -import Data.List import HaskellWorks.Data.Bits.PopCount.PopCount1 import HaskellWorks.Data.FromForeignRegion import HaskellWorks.Data.RankSelect.Base.Select1 @@ -14,13 +13,15 @@ import Options.Applicative import System.Directory -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +import qualified Data.List as L +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} + runPoppy512SelectAll :: IO () runPoppy512SelectAll = do entries <- getDirectoryContents "data" - let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries + let files = ("data/" ++) <$> (".ib" `L.isSuffixOf`) `filter` entries forM_ files $ \file -> do putStrLn $ "Loading cspoppy for " <> file v :: Poppy512 <- mmapFromForeignRegion file @@ -32,7 +33,7 @@ runCsPoppySelectAll :: IO () runCsPoppySelectAll = do entries <- getDirectoryContents "data" - let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries + let files = ("data/" ++) <$> (".ib" `L.isSuffixOf`) `filter` entries forM_ files $ \file -> do putStrLn $ "Loading cspoppy for " <> file v :: CsPoppy <- mmapFromForeignRegion file diff --git a/bench/Main.hs b/bench/Main.hs --- a/bench/Main.hs +++ b/bench/Main.hs @@ -25,8 +25,8 @@ import qualified HaskellWorks.Data.RankSelect.CsPoppy as CS import qualified HaskellWorks.Data.RankSelect.Poppy512 as P512 -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} selectStep :: Count selectStep = 1000 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.4.0 +version: 0.13.4.1 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-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 data/README.md @@ -30,29 +30,29 @@ common base { build-depends: base >= 4.11 && < 5 } common QuickCheck { build-depends: QuickCheck >= 2.10 && < 2.15 } -common bytestring { build-depends: bytestring >= 0.10 && < 0.11 } +common bytestring { build-depends: bytestring >= 0.10 && < 0.12 } 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 directory { build-depends: directory >= 1.2 && < 1.4 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.21 } 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 generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 2.3 } +common hedgehog { build-depends: hedgehog >= 1.0 && < 1.2 } common hspec { build-depends: hspec >= 2.4 && < 3 } -common hw-balancedparens { build-depends: hw-balancedparens >= 0.2.2.0 && < 0.4 } +common hw-balancedparens { build-depends: hw-balancedparens >= 0.2.2.0 && < 0.5 } 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 lens { build-depends: lens >= 4 && < 6 } 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 optparse-applicative { build-depends: optparse-applicative >= 0.11 && < 0.18 } common resourcet { build-depends: resourcet >= 1.1 && < 1.3 } -common transformers { build-depends: transformers >= 0.4 && < 0.6 } +common transformers { build-depends: transformers >= 0.4 && < 0.7 } common vector { build-depends: vector >= 0.12 && < 0.13 } common config @@ -188,7 +188,7 @@ , doctest-discover , hw-rankselect 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/test/HaskellWorks/Data/RankSelect/BasicGen.hs b/test/HaskellWorks/Data/RankSelect/BasicGen.hs --- a/test/HaskellWorks/Data/RankSelect/BasicGen.hs +++ b/test/HaskellWorks/Data/RankSelect/BasicGen.hs @@ -19,8 +19,8 @@ import Hedgehog import Test.Hspec -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} genRank0UpTo8Spec :: forall s. (Typeable s, BitRead s, Rank0 s, Show s) => s -> Spec genRank0UpTo8Spec _ = describe ("Generically up to 8 bits for " ++ show (typeOf (undefined :: s))) $ do diff --git a/test/HaskellWorks/Data/RankSelect/BinarySearchSpec.hs b/test/HaskellWorks/Data/RankSelect/BinarySearchSpec.hs --- a/test/HaskellWorks/Data/RankSelect/BinarySearchSpec.hs +++ b/test/HaskellWorks/Data/RankSelect/BinarySearchSpec.hs @@ -13,8 +13,8 @@ import qualified Data.Vector.Storable as DVS -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.RankSelect.BinarySearchSpec" $ do 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 @@ -18,8 +18,8 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.RankSelect.Internal.BitSeqSpec" $ do diff --git a/test/HaskellWorks/Data/RankSelect/CsPoppy/InternalSpec.hs b/test/HaskellWorks/Data/RankSelect/CsPoppy/InternalSpec.hs --- a/test/HaskellWorks/Data/RankSelect/CsPoppy/InternalSpec.hs +++ b/test/HaskellWorks/Data/RankSelect/CsPoppy/InternalSpec.hs @@ -16,8 +16,8 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} makeCsPoppyBlocksRef :: DVS.Vector Word64 -> DVS.Vector Word64 makeCsPoppyBlocksRef v = DVS.generate (((DVS.length v + 8 - 1) `div` 8) + 1) genBlocks 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 @@ -41,8 +41,8 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} newtype ShowVector a = ShowVector a deriving (Eq, BitShow) diff --git a/test/HaskellWorks/Data/RankSelect/InternalSpec.hs b/test/HaskellWorks/Data/RankSelect/InternalSpec.hs --- a/test/HaskellWorks/Data/RankSelect/InternalSpec.hs +++ b/test/HaskellWorks/Data/RankSelect/InternalSpec.hs @@ -17,8 +17,8 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.RankSelect.InternalSpec" $ do diff --git a/test/HaskellWorks/Data/RankSelect/Poppy512Spec.hs b/test/HaskellWorks/Data/RankSelect/Poppy512Spec.hs --- a/test/HaskellWorks/Data/RankSelect/Poppy512Spec.hs +++ b/test/HaskellWorks/Data/RankSelect/Poppy512Spec.hs @@ -27,8 +27,8 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.RankSelect.Poppy512.Rank1Spec" $ do diff --git a/test/HaskellWorks/Data/RankSelect/SimpleSpec.hs b/test/HaskellWorks/Data/RankSelect/SimpleSpec.hs --- a/test/HaskellWorks/Data/RankSelect/SimpleSpec.hs +++ b/test/HaskellWorks/Data/RankSelect/SimpleSpec.hs @@ -16,7 +16,7 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Redundant do" -} spec :: Spec spec = describe "HaskellWorks.Data.SuccinctSpec" $ do 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 @@ -24,7 +24,7 @@ import qualified Hedgehog.Range as R import qualified System.Directory as IO -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Reduce duplication" -} entries :: [FilePath] entries = mfilter (".idx" `isSuffixOf`) <$> unsafePerformIO $ IO.getDirectoryContents "data"