From 7bf51eb370483eed4ef8fa4354e658ae802fa727 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 22 Jul 2021 11:54:28 +1000 Subject: [PATCH] Remove dependency on deprecated library --- Criterion/Main/Options.hs | 5 ++--- criterion.cabal | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Criterion/Main/Options.hs b/Criterion/Main/Options.hs index 7f87839..7127f9c 100644 --- a/Criterion/Main/Options.hs +++ b/Criterion/Main/Options.hs @@ -36,13 +36,12 @@ import Data.Version (showVersion) import GHC.Generics (Generic) import Options.Applicative import Options.Applicative.Help (Chunk(..)) -import Options.Applicative.Help.Pretty ((.$.)) +import Options.Applicative.Help.Pretty ((.$.), Doc, text) import Options.Applicative.Types import Paths_criterion (version) import Prelude () import Prelude.Compat import Statistics.Types (mkCL,cl95) -import Text.PrettyPrint.ANSI.Leijen (Doc, text) import qualified Data.Map as M -- | How to match a benchmark name. @@ -243,5 +242,5 @@ versionInfo = "built with criterion " <> showVersion version regressionHelp :: Chunk Doc regressionHelp = fmap (text "Regression metrics (for use with --regress):" .$.) $ - tabulate [(text n,text d) | (n,(_,d)) <- map f measureKeys] + tabulate [(text n, text d) | (n,(_,d)) <- map f measureKeys] where f k = (k, measureAccessors M.! k) diff --git a/criterion.cabal b/criterion.cabal index 597bf8f..5c07ab3 100644 --- a/criterion.cabal +++ b/criterion.cabal @@ -85,7 +85,6 @@ library -- TODO: Eventually, we should bump the lower version bounds to >=2 so that -- we can remove some CPP in Criterion.Report. See #247. aeson >= 1 && < 2.2, - ansi-wl-pprint >= 0.6.7.2, base >= 4.5 && < 5, base-compat-batteries >= 0.10 && < 0.13, binary >= 0.5.1.0,