diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ # Copyright: (c) 2015-2022 Rudy Matela # License: 3-Clause BSD (see the file LICENSE) # Maintainer: Rudy Matela -GHC=ghc-9.10 TESTS = test/main \ test/text EGS = \ @@ -115,7 +114,6 @@ ./bench/tiers "Day" 9 | diff -rud test/diff/tiers-Day.out - ./bench/tiers "DiffTime" | diff -rud test/diff/tiers-DiffTime.out - ./bench/tiers "Array Int Int" | diff -rud test/diff/tiers-ArrayIntInt.out - - ./bench/tiers "These Int Int" | diff -rud test/diff/tiers-TheseIntInt.out - update-diff-test-tiers: bench/tiers ./bench/tiers "Natural" > test/diff/tiers-Natural.out @@ -133,4 +131,3 @@ ./bench/tiers "Day" 9 > test/diff/tiers-Day.out ./bench/tiers "DiffTime" > test/diff/tiers-DiffTime.out ./bench/tiers "Array Int Int" > test/diff/tiers-ArrayIntInt.out - ./bench/tiers "These Int Int" > test/diff/tiers-TheseIntInt.out diff --git a/bench/tiers.hs b/bench/tiers.hs --- a/bench/tiers.hs +++ b/bench/tiers.hs @@ -20,7 +20,6 @@ import Data.Text (Text) import Data.Time import Numeric.Natural -import Data.These dropEmptyTiersTail :: [[a]] -> [[a]] dropEmptyTiersTail ([]:[]:[]: []:[]:[]: _) = [] @@ -116,7 +115,5 @@ "Day" -> put t n (u :: Day ) "DiffTime" -> put t n (u :: DiffTime ) "UTCTime" -> put t n (u :: UTCTime ) - -- other - "These Int Int" -> put t n (u :: These Int Int ) -- unhandled _ -> putStrLn $ "unknown/unhandled type `" ++ t ++ "'" diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -2,10 +2,17 @@ ================================= +v0.0.8 +------ + +* fix build of tests on GHC 9.10 + + v0.0.6 ------ -* fix tests on GHC 9.10 +* unbuildable/incorrect release, + please do not use this one. v0.0.5 @@ -18,7 +25,7 @@ v0.0.4 ------ -* minor improvement on `Listable UTCTime` +* minor improvement on Listable UTCTime * improve tests diff --git a/leancheck-instances.cabal b/leancheck-instances.cabal --- a/leancheck-instances.cabal +++ b/leancheck-instances.cabal @@ -1,6 +1,6 @@ -- Cabal file for leancheck-instances name: leancheck-instances -version: 0.0.6 +version: 0.0.8 synopsis: Common LeanCheck instances description: Listable instances for types provided by the Haskell Platform. @@ -52,7 +52,7 @@ source-repository this type: git location: https://github.com/rudymatela/leancheck-instances - tag: v0.0.6 + tag: v0.0.8 library exposed-modules: Test.LeanCheck.Instances @@ -73,7 +73,6 @@ , text , time , array - , these default-language: Haskell2010 test-suite main diff --git a/src/Test/LeanCheck/Instances.hs b/src/Test/LeanCheck/Instances.hs --- a/src/Test/LeanCheck/Instances.hs +++ b/src/Test/LeanCheck/Instances.hs @@ -40,4 +40,3 @@ import Test.LeanCheck.Instances.Containers () import Test.LeanCheck.Instances.Time () import Test.LeanCheck.Instances.Void () -import Test.LeanCheck.Instances.These () diff --git a/test/diff/tiers-TheseIntInt.out b/test/diff/tiers-TheseIntInt.out deleted file mode 100644 --- a/test/diff/tiers-TheseIntInt.out +++ /dev/null @@ -1,125 +0,0 @@ -map length (tiers :: [[ These Int Int ]]) = [3,4,5,6,7,8,9,10,11,12,13,14,...] - -length (list :: [ These Int Int ]) = Infinity - -allUnique (list :: [ These Int Int ]) = True - -ratioRepetitions (list :: [ These Int Int ]) = 0 % 1 - -tiers :: [These Int Int] = - [ [ This 0 - , That 0 - , These 0 0 - ] - , [ This 1 - , That 1 - , These 0 1 - , These 1 0 - ] - , [ This (-1) - , That (-1) - , These 0 (-1) - , These 1 1 - , These (-1) 0 - ] - , [ This 2 - , That 2 - , These 0 2 - , These 1 (-1) - , These (-1) 1 - , These 2 0 - ] - , [ This (-2) - , That (-2) - , These 0 (-2) - , These 1 2 - , These (-1) (-1) - , These 2 1 - , These (-2) 0 - ] - , [ This 3 - , That 3 - , These 0 3 - , These 1 (-2) - , These (-1) 2 - , These 2 (-1) - , These (-2) 1 - , These 3 0 - ] - , [ This (-3) - , That (-3) - , These 0 (-3) - , These 1 3 - , These (-1) (-2) - , These 2 2 - , These (-2) (-1) - , These 3 1 - , These (-3) 0 - ] - , [ This 4 - , That 4 - , These 0 4 - , These 1 (-3) - , These (-1) 3 - , These 2 (-2) - , These (-2) 2 - , These 3 (-1) - , These (-3) 1 - , These 4 0 - ] - , [ This (-4) - , That (-4) - , These 0 (-4) - , These 1 4 - , These (-1) (-3) - , These 2 3 - , These (-2) (-2) - , These 3 2 - , These (-3) (-1) - , These 4 1 - , These (-4) 0 - ] - , [ This 5 - , That 5 - , These 0 5 - , These 1 (-4) - , These (-1) 4 - , These 2 (-3) - , These (-2) 3 - , These 3 (-2) - , These (-3) 2 - , These 4 (-1) - , These (-4) 1 - , These 5 0 - ] - , [ This (-5) - , That (-5) - , These 0 (-5) - , These 1 5 - , These (-1) (-4) - , These 2 4 - , These (-2) (-3) - , These 3 3 - , These (-3) (-2) - , These 4 2 - , These (-4) (-1) - , These 5 1 - , These (-5) 0 - ] - , [ This 6 - , That 6 - , These 0 6 - , These 1 (-5) - , These (-1) 5 - , These 2 (-4) - , These (-2) 4 - , These 3 (-3) - , These (-3) 3 - , These 4 (-2) - , These (-4) 2 - , These 5 (-1) - , These (-5) 1 - , These 6 0 - ] - , ... - ] diff --git a/test/main.hs b/test/main.hs --- a/test/main.hs +++ b/test/main.hs @@ -12,7 +12,6 @@ import qualified Data.Map as Map import qualified Data.Sequence as Seq import Numeric.Natural -import Data.These import Test.LeanCheck import Test.LeanCheck.Instances @@ -48,7 +47,4 @@ , fails n $ \m1 m2 -> m1 `Map.union` m2 == m2 `Map.union` (m1 :: Map Int Int) , holds n $ \m1 -> m1 `Map.union` m1 == (m1 :: Map Int Int) - - , fails n $ \t -> let p = uncurry (*) (fromThese 2 3 t) :: Int - in p `mod` 2 == 0 || p `mod` 3 == 0 ]