diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-05 14:52:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-05 14:52:06 -0400 |
| commit | 31f118f51dc3a8a32c0257209544dfb50542f696 (patch) | |
| tree | 85ce438e443cf678b21fbfb980ff2473c737f657 | |
| parent | 747da87efa9c234015cd0be9db9cbdcf4f5c7336 (diff) | |
move Arbitrary instance to new Types.Transfer module
Avoid orphan instance warning
| -rw-r--r-- | Logs/Transfer.hs | 13 | ||||
| -rw-r--r-- | Types/Transfer.hs | 11 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index 37c637af3..65a4e3796 100644 --- a/Logs/Transfer.hs +++ b/Logs/Transfer.hs @@ -5,7 +5,6 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# OPTIONS_GHC -fno-warn-orphans #-} {-# LANGUAGE CPP #-} module Logs.Transfer where @@ -16,7 +15,6 @@ import Annex.Perms import qualified Git import Utility.Metered import Utility.Percentage -import Utility.QuickCheck import Utility.PID import Annex.LockPool import Logs.TimeStamp @@ -292,17 +290,6 @@ failedTransferDir u direction r = gitAnnexTransferDir r </> showLcDirection direction </> filter (/= '/') (fromUUID u) -instance Arbitrary TransferInfo where - arbitrary = TransferInfo - <$> arbitrary - <*> arbitrary - <*> pure Nothing -- cannot generate a ThreadID - <*> pure Nothing -- remote not needed - <*> arbitrary - -- associated file cannot be empty (but can be Nothing) - <*> arbitrary `suchThat` (/= Just "") - <*> arbitrary - prop_read_write_transferinfo :: TransferInfo -> Bool prop_read_write_transferinfo info | isJust (transferRemote info) = True -- remote not stored diff --git a/Types/Transfer.hs b/Types/Transfer.hs index 528d1d5cb..905b29ea2 100644 --- a/Types/Transfer.hs +++ b/Types/Transfer.hs @@ -9,6 +9,7 @@ module Types.Transfer where import Types import Utility.PID +import Utility.QuickCheck import Data.Time.Clock.POSIX import Control.Concurrent @@ -45,3 +46,13 @@ stubTransferInfo = TransferInfo Nothing Nothing Nothing Nothing Nothing Nothing data Direction = Upload | Download deriving (Eq, Ord, Read, Show) +instance Arbitrary TransferInfo where + arbitrary = TransferInfo + <$> arbitrary + <*> arbitrary + <*> pure Nothing -- cannot generate a ThreadID + <*> pure Nothing -- remote not needed + <*> arbitrary + -- associated file cannot be empty (but can be Nothing) + <*> arbitrary `suchThat` (/= Just "") + <*> arbitrary |