From 4f2170e7b83181c896179dc7d0bbb10252dd32f9 Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Thu, 1 Aug 2019 14:29:04 +0200 Subject: [PATCH 1/2] Relax version bounds --- higgledy.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/higgledy.cabal b/higgledy.cabal index b2646ca..42aad36 100644 --- a/higgledy.cabal +++ b/higgledy.cabal @@ -26,7 +26,7 @@ library build-depends: base ^>= 4.12 , barbies ^>= 1.1.0 , generic-lens ^>= 1.1.0 - , QuickCheck ^>= 2.12.6 + , QuickCheck >= 2.12.6 && < 2.14 hs-source-dirs: src default-language: Haskell2010 @@ -35,9 +35,9 @@ test-suite test , barbies ^>= 1.1.0 , doctest ^>= 0.16.0 , higgledy - , hspec ^>= 2.6.1 + , hspec >= 2.6.1 && < 2.8 , lens ^>= 4.17 - , QuickCheck ^>= 2.12.6 + , QuickCheck >= 2.12.6 && < 2.14 main-is: Main.hs type: exitcode-stdio-1.0 hs-source-dirs: test From 3b9171e303b3242538b654e9bf4a504c6f11c31e Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Thu, 1 Aug 2019 14:29:17 +0200 Subject: [PATCH 2/2] Relax doctests --- src/Data/Generic/HKD.hs | 6 +++--- src/Data/Generic/HKD/Build.hs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Data/Generic/HKD.hs b/src/Data/Generic/HKD.hs index b0041f1..adbce48 100644 --- a/src/Data/Generic/HKD.hs +++ b/src/Data/Generic/HKD.hs @@ -65,7 +65,7 @@ import qualified Data.Generics.Product as G -- >>> total & field @"oops" .~ pure () -- ... -- ... error: --- ... • The type HKD User Last does not contain a field named 'oops'. +-- ... The type HKD User Last does not contain a field named 'oops'. -- ... field :: forall field f structure inner @@ -91,8 +91,8 @@ field -- >>> deconstruct ("Hello", True) ^. position @4 -- ... -- ... error: --- ... • The type HKD --- ... ([Char], Bool) f does not contain a field at position 4 +-- ... The type HKD +-- ... ([Char], Bool) f does not contain a field at position 4 -- ... position :: forall index f structure inner diff --git a/src/Data/Generic/HKD/Build.hs b/src/Data/Generic/HKD/Build.hs index cab1860..70e710e 100644 --- a/src/Data/Generic/HKD/Build.hs +++ b/src/Data/Generic/HKD/Build.hs @@ -75,14 +75,14 @@ instance (Generic shape, GFill f with '[] (Rep shape)) -- = User { name :: String, age :: Int, likesDogs :: Bool } -- deriving Generic -- :} --- +-- -- >>> :{ -- test :: _ -- test = build @User -- :} -- ... --- ... • Found type wildcard ‘_’ --- ... standing for ‘f [Char] -> f Int -> f Bool -> HKD User f’ +-- ... Found type wildcard ... +-- ... standing for ...f [Char] -> f Int -> f Bool -> HKD User f... -- ... -- -- Once we call the 'build' function, and indicate the type we want to build,