From f2c83fe1c7bfefe3a59fef75fa6ecc93a8fd95e2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Jun 2017 13:04:48 -0400 Subject: Fix build with QuickCheck 2.10. QuickCheck added an Arbitrary instance for CTime aka EpochTime. However, while git-annex's instance disallowed times before the epoch, QuickCheck's does not. So, rather than using its instance, convert from an Integer. This commit was sponsored by Thomas Hochstein on Patreon. --- Utility/InodeCache.hs | 3 ++- Utility/QuickCheck.hs | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'Utility') diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs index e91771a07..7e2d9992a 100644 --- a/Utility/InodeCache.hs +++ b/Utility/InodeCache.hs @@ -210,7 +210,8 @@ instance Arbitrary InodeCache where let prim = InodeCachePrim <$> arbitrary <*> arbitrary - <*> arbitrary + -- timestamp cannot be negative + <*> (abs . fromInteger <$> arbitrary) in InodeCache <$> prim #ifdef mingw32_HOST_OS diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs index 0181ea950..e89d103dd 100644 --- a/Utility/QuickCheck.hs +++ b/Utility/QuickCheck.hs @@ -35,9 +35,6 @@ instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) where instance Arbitrary POSIXTime where arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral -instance Arbitrary EpochTime where - arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral - {- Pids are never negative, or 0. -} instance Arbitrary ProcessID where arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0) -- cgit v1.2.3