From b50d443604be4025e907e578a5bb0d0421045fe2 Mon Sep 17 00:00:00 2001 From: Ben Price Date: Wed, 16 Aug 2023 19:50:41 +0100 Subject: [PATCH] chore: upgrade Hedgehog to version 1.4 This needs a few simple fixes due to `Gen.element` now being polymorphic, which interacts slightly badly with overloaded lists. Signed-off-by: Ben Price --- primer-api/primer-api.cabal | 2 +- primer-service/primer-service.cabal | 4 ++-- primer/primer.cabal | 6 +++--- primer/test/Tests/Action/Available.hs | 2 +- primer/test/Tests/Eval/Utils.hs | 2 +- primer/test/Tests/Questions.hs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/primer-api/primer-api.cabal b/primer-api/primer-api.cabal index 39cbced9d..b2d9cf574 100644 --- a/primer-api/primer-api.cabal +++ b/primer-api/primer-api.cabal @@ -67,7 +67,7 @@ library primer-api-hedgehog build-depends: , base - , hedgehog ^>=1.1 + , hedgehog ^>=1.4 , primer-api , primer:{primer, primer-hedgehog, primer-testlib} diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal index ae9a1af03..44822f02a 100644 --- a/primer-service/primer-service.cabal +++ b/primer-service/primer-service.cabal @@ -193,7 +193,7 @@ test-suite service-test , aeson-pretty , base , bytestring - , hedgehog ^>=1.1 + , hedgehog ^>=1.4 , hedgehog-quickcheck ^>=0.1.1 , hspec ^>=2.10 , openapi3 @@ -207,7 +207,7 @@ test-suite service-test , tasty ^>=1.4.1 , tasty-discover ^>=5.0 , tasty-golden ^>=2.3.5 - , tasty-hedgehog ^>=1.3 + , tasty-hedgehog ^>=1.4.0.2 , tasty-hspec ^>=1.2.0.1 , tasty-hunit ^>=0.10.0 , text diff --git a/primer/primer.cabal b/primer/primer.cabal index fc1f27669..5dc4104a5 100644 --- a/primer/primer.cabal +++ b/primer/primer.cabal @@ -156,13 +156,13 @@ library primer-hedgehog , base , containers , extra - , hedgehog ^>=1.1 + , hedgehog ^>=1.4 , mmorph ^>=1.2.0 , mtl , primer , primer-testlib , tasty-discover ^>=5.0 - , tasty-hedgehog ^>=1.3 + , tasty-hedgehog ^>=1.4.0.2 library primer-testlib visibility: public @@ -269,7 +269,7 @@ test-suite primer-test , extra , filepath , hedgehog - , hedgehog-classes ^>=0.2.5.3 + , hedgehog-classes ^>=0.2.5.4 , logging-effect , mtl , optics diff --git a/primer/test/Tests/Action/Available.hs b/primer/test/Tests/Action/Available.hs index 71529ef8b..8f328f98b 100644 --- a/primer/test/Tests/Action/Available.hs +++ b/primer/test/Tests/Action/Available.hs @@ -354,7 +354,7 @@ tasty_available_actions_accepted = withTests 500 $ KHole m -> [getID m] KType m -> [getID m] KFun m k1 k2 -> [getID m] <> allKindIDs k1 <> allKindIDs k2 - id <- Gen.element $ allKindIDs k + id <- Gen.element @[] $ allKindIDs k pure ( "forTypeDefParamKindNode" , diff --git a/primer/test/Tests/Eval/Utils.hs b/primer/test/Tests/Eval/Utils.hs index 531b1fd04..8cb166a68 100644 --- a/primer/test/Tests/Eval/Utils.hs +++ b/primer/test/Tests/Eval/Utils.hs @@ -48,7 +48,7 @@ import Test.Tasty.HUnit (Assertion, (@?=)) -- * the type of the term genDirTm :: PropertyT WT (Dir, Expr, Type' ()) genDirTm = do - dir <- forAllT $ Gen.element [Chk, Syn] + dir <- forAllT $ Gen.element @[] [Chk, Syn] (t', ty) <- case dir of Chk -> do ty' <- forAllT $ genWTType $ KType () diff --git a/primer/test/Tests/Questions.hs b/primer/test/Tests/Questions.hs index b744dfdf0..55fb8f4b9 100644 --- a/primer/test/Tests/Questions.hs +++ b/primer/test/Tests/Questions.hs @@ -150,7 +150,7 @@ genSTE' = Right (ty, True) -> Global (qualifyName m n, ty) in evalExprGen 0 $ Gen.list (Range.linear 0 20) $ toSTE' <$> genModuleName <*> genName <*> g where - genModuleName = ModuleName <$> Gen.element [["M"], ["M1"]] + genModuleName = ModuleName <$> Gen.element @[] [["M"], ["M1"]] genSTE :: Gen ShadowedVarsExpr genSTE = deal . nubOrdOn nameSTE' <$> genSTE'