diff -Nru haskell-quickcheck-safe-0.1.0.4/Changelog haskell-quickcheck-safe-0.1.0.6/Changelog --- haskell-quickcheck-safe-0.1.0.4/Changelog 2018-05-02 22:12:39.000000000 +0000 +++ haskell-quickcheck-safe-0.1.0.6/Changelog 2019-04-29 14:48:08.000000000 +0000 @@ -1,3 +1,9 @@ +QuickCheck-safe 0.1.0.6 + * compatibility with QuickCheck 2.13 + +QuickCheck-safe 0.1.0.5 + * compatibility with QuickCheck 2.12 + QuickCheck-safe 0.1.0.4 * compatibility with QuickCheck 2.11 diff -Nru haskell-quickcheck-safe-0.1.0.4/debian/changelog haskell-quickcheck-safe-0.1.0.6/debian/changelog --- haskell-quickcheck-safe-0.1.0.4/debian/changelog 2018-09-30 18:18:46.000000000 +0000 +++ haskell-quickcheck-safe-0.1.0.6/debian/changelog 2019-08-03 22:19:29.000000000 +0000 @@ -1,3 +1,15 @@ +haskell-quickcheck-safe (0.1.0.6-1build1) eoan; urgency=medium + + * Rebuild against new GHC abi. + + -- Gianfranco Costamagna Sun, 04 Aug 2019 00:19:29 +0200 + +haskell-quickcheck-safe (0.1.0.6-1) unstable; urgency=medium + + * New upstream release + + -- Clint Adams Sat, 27 Jul 2019 21:03:18 -0400 + haskell-quickcheck-safe (0.1.0.4-2) unstable; urgency=medium * Bump debhelper compat level to 10 diff -Nru haskell-quickcheck-safe-0.1.0.4/debian/control haskell-quickcheck-safe-0.1.0.6/debian/control --- haskell-quickcheck-safe-0.1.0.4/debian/control 2018-09-29 11:08:11.000000000 +0000 +++ haskell-quickcheck-safe-0.1.0.6/debian/control 2019-07-28 01:03:18.000000000 +0000 @@ -12,7 +12,7 @@ ghc-prof, haskell-devscripts (>= 0.13), libghc-quickcheck2-dev (>= 2.7.3), - libghc-quickcheck2-dev (<< 2.12), + libghc-quickcheck2-dev (<< 2.14), libghc-quickcheck2-prof, Build-Depends-Indep: ghc-doc, diff -Nru haskell-quickcheck-safe-0.1.0.4/QuickCheck-safe.cabal haskell-quickcheck-safe-0.1.0.6/QuickCheck-safe.cabal --- haskell-quickcheck-safe-0.1.0.4/QuickCheck-safe.cabal 2018-05-02 22:12:39.000000000 +0000 +++ haskell-quickcheck-safe-0.1.0.6/QuickCheck-safe.cabal 2019-04-29 14:48:08.000000000 +0000 @@ -1,5 +1,5 @@ name: QuickCheck-safe -version: 0.1.0.4 +version: 0.1.0.6 synopsis: Safe reimplementation of QuickCheck's core description: QuickCheck-safe reimplements the quickCheck functionality with a pure @@ -33,7 +33,8 @@ library hs-source-dirs: src build-depends: - QuickCheck >= 2.7.3 && < 2.12, + QuickCheck >= 2.7.3 && < 2.14, + containers >= 0.5 && < 0.7, base >= 4.6 && < 5 exposed-modules: Test.QuickCheck.Safe diff -Nru haskell-quickcheck-safe-0.1.0.4/src/Test/QuickCheck/Safe.hs haskell-quickcheck-safe-0.1.0.6/src/Test/QuickCheck/Safe.hs --- haskell-quickcheck-safe-0.1.0.4/src/Test/QuickCheck/Safe.hs 2018-05-02 22:12:39.000000000 +0000 +++ haskell-quickcheck-safe-0.1.0.6/src/Test/QuickCheck/Safe.hs 2019-04-29 14:48:08.000000000 +0000 @@ -33,6 +33,8 @@ quickCheck, quickCheckResult, quickCheckWith, quickCheckWithResult) import Test.QuickCheck.Gen (Gen(..)) import Control.Monad +import qualified Data.Set as S +import qualified Data.Map as M -- STestable and SProperty are simplified versions of Testable/Property class STestable prop where @@ -181,13 +183,27 @@ | pass >= maxSuccess args = return Success{ numTests = pass, +#if MIN_VERSION_QuickCheck(2,12,0) + numDiscarded = disc, + labels = M.empty, + classes = M.empty, + tables = M.empty, +#else labels = [], +#endif output = "+++ OK, passed " ++ show pass ++ " tests.\n" } | disc > (maxDiscardRatio args - 1) * maxSuccess args = return GaveUp{ numTests = pass, +#if MIN_VERSION_QuickCheck(2,12,0) + numDiscarded = disc, + labels = M.empty, + classes = M.empty, + tables = M.empty, +#else labels = [], +#endif output = "*** Gave up! Passed only " ++ show pass ++ " tests.\n" } | otherwise = do @@ -196,10 +212,10 @@ case res of SOk -> runTests (pass + 1) disc sizes SDiscard -> runTests pass (disc + 1) sizes - SFail{} -> return $ deflate pass 0 0 0 seed size res + SFail{} -> return $ deflate pass disc 0 0 0 seed size res - deflate :: Int -> Int -> Int -> Int -> QCGen -> Int -> SResult -> Result - deflate pass !shr !shrT !shrF seed size res@SFail{ sSmaller = [] } = + deflate :: Int -> Int -> Int -> Int -> Int -> QCGen -> Int -> SResult -> Result + deflate pass disc !shr !shrT !shrF seed size res@SFail{ sSmaller = [] } = Failure{ numTests = pass, numShrinks = shr, @@ -209,10 +225,16 @@ usedSize = size, reason = reason, theException = sException res, - labels = map (\x -> (x, 0)) (sLabels res), #if MIN_VERSION_QuickCheck(2,10,0) failingTestCase = sLabels res, #endif +#if !MIN_VERSION_QuickCheck(2,12,0) + labels = map (\x -> (x, 0)) (sLabels res), +#else + numDiscarded = disc, + failingLabels = sLabels res, + failingClasses = S.empty, +#endif output = "*** Failed! " ++ reason ++ " (after " ++ count (pass + 1) "test" ++ (if shr > 0 then " and " ++ count shr "shrink" else "") ++ @@ -222,10 +244,10 @@ count i w = show i ++ " " ++ w ++ ['s' | i /= 1] reason = maybe "Falsifiable" (\e -> "Exception: '" ++ show e ++ "'") $ sException res - deflate pass shr shrT shrF seed size res@SFail{ sSmaller = res' : rs } = + deflate pass disc shr shrT shrF seed size res@SFail{ sSmaller = res' : rs } = case res' of - SFail{} -> deflate pass (shr + 1) (shrT + shrF) 0 seed size res' - _ -> deflate pass shr shrT (shrF + 1) seed size res{ sSmaller = rs } + SFail{} -> deflate pass disc (shr + 1) (shrT + shrF) 0 seed size res' + _ -> deflate pass disc shr shrT (shrF + 1) seed size res{ sSmaller = rs } sizes :: [Int] sizes = cycle [0..maxSize args]