mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

simplify Applicative instance

Browse source
This commit is contained in:
Joey Hess 2019-03-06 16:44:17 -04:00
parent 1b3d04979e
commit 3b412aaae0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Types/UUID.hs
View file

@ -14,7 +14,6 @@ import qualified Data.Map as M
import qualified Data.UUID as U import qualified Data.UUID as U
import Data.Maybe import Data.Maybe
import Data.String import Data.String
import Data.Char
import Data.ByteString.Builder import Data.ByteString.Builder
import qualified Data.Semigroup as Sem import qualified Data.Semigroup as Sem
@ -87,11 +86,5 @@ instance Proto.Serializable UUID where
instance Arbitrary UUID where instance Arbitrary UUID where
arbitrary = frequency [(1, return NoUUID), (3, UUID <$> arb)] arbitrary = frequency [(1, return NoUUID), (3, UUID <$> arb)]
where where
-- Avoid non-ascii because fully arbitrary arb = encodeBS <$> listOf1 (elements uuidchars)
-- strings may not be encoded using the filesystem uuidchars = '-' : ['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9']
-- encoding, which is normally applied to all input.
-- Avoid whitespace because UUIDs are used in log files.
-- Avoid empty because that's NoUUID
arb = encodeBS . getNonEmpty <$> arbitrary
`suchThat` (all isAscii . getNonEmpty)
`suchThat` (all (not . isSpace) . getNonEmpty)