41d890d · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Fix MonadFail issues, build with ghc-8.10

commit41d890d3e5754f94ec1d3a5914f61b1edfcf561a authorNick <nick@typeable.io> dateFri 9 Apr 2021, 11:47 (6 years ago) parent4c743e1

6 files changed+25−8

compare with master

unifiedsplit

bloodhound.cabal+4−4 src/Database/V1/Bloodhound/Internal/Client.hs+1−1 src/Database/V1/Bloodhound/Internal/Query.hs+1−1 src/Database/V5/Bloodhound/Internal/Client.hs+2−1 src/Database/V5/Bloodhound/Internal/Query.hs+1−1 stack-8.10.yaml+16

bloodhound.cabal+4−4

@@ -67,18 +67,18 @@ library

6767 aeson >= 0.11.1,

6868 blaze-builder,

6969 bytestring >= 0.10.0 && <0.11,

70− containers >= 0.5.0.0 && <0.6,

70+ containers >= 0.5.0.0 && <0.7,

7171 exceptions,

7272 hashable,

73− http-client >= 0.4.30 && <0.6,

73+ http-client >= 0.4.30 && <0.7,

7474 http-types >= 0.8 && <0.13,

7575 mtl >= 1.0 && <2.3,

7676 network-uri >= 2.6 && <2.7,

7777 scientific >= 0.3.0.0 && <0.4.0.0,

78− semigroups >= 0.15 && <0.19,

78+ semigroups >= 0.15 && <0.20,

7979 semver,

8080 text >= 0.11 && <1.3,

81− time >= 1.4 && <1.9,

81+ time >= 1.4 && <1.10,

8282 transformers >= 0.2 && <0.6,

8383 unordered-containers,

8484 vector >= 0.10.9 && <0.13

src/Database/V1/Bloodhound/Internal/Client.hs+1−1

@@ -1552,7 +1552,7 @@ instance ToJSON Interval where

15521552 toJSON Second = "second"

15531553 toJSON (FractionalInterval fraction interval) = toJSON $ show fraction ++ show interval

15541554

1555−parseStringInterval :: (Monad m) => String -> m NominalDiffTime

1555+parseStringInterval :: (MonadFail m) => String -> m NominalDiffTime

15561556parseStringInterval s = case span isNumber s of

15571557 ("", _) -> fail "Invalid interval"

15581558 (nS, unitS) -> case (readMay nS, readMay unitS) of

src/Database/V1/Bloodhound/Internal/Query.hs+1−1

@@ -1468,7 +1468,7 @@ instance FromJSON ZeroTermsQuery where

14681468 parse "all" = pure ZeroTermsAll

14691469 parse q = fail ("Unexpected ZeroTermsQuery: " <> show q)

14701470

1471−fieldTagged :: Monad m => (FieldName -> Object -> m a) -> Object -> m a

1471+fieldTagged :: MonadFail m => (FieldName -> Object -> m a) -> Object -> m a

14721472fieldTagged f o = case HM.toList o of

14731473 [(k, Object o')] -> f (FieldName k) o'

14741474 _ -> fail "Expected object with 1 field-named key"

src/Database/V5/Bloodhound/Internal/Client.hs+2−1

@@ -62,6 +62,7 @@ newtype BH m a = BH {

6262 } deriving ( Functor

6363 , Applicative

6464 , Monad

65+ , MonadFail

6566 , MonadIO

6667 , MonadState s

6768 , MonadWriter w

@@ -2331,7 +2332,7 @@ instance ToJSON Interval where

23312332 toJSON Minute = "minute"

23322333 toJSON Second = "second"

23332334

2334−parseStringInterval :: (Monad m) => String -> m NominalDiffTime

2335+parseStringInterval :: (MonadFail m) => String -> m NominalDiffTime

23352336parseStringInterval s = case span isNumber s of

23362337 ("", _) -> fail "Invalid interval"

23372338 (nS, unitS) -> case (readMay nS, readMay unitS) of

src/Database/V5/Bloodhound/Internal/Query.hs+1−1

@@ -1617,7 +1617,7 @@ functionScoreFunctionsPair (FunctionScoreSingle fn)

16171617functionScoreFunctionsPair (FunctionScoreMultiple componentFns) =

16181618 ("functions", toJSON componentFns)

16191619

1620−fieldTagged :: Monad m => (FieldName -> Object -> m a) -> Object -> m a

1620+fieldTagged :: MonadFail m => (FieldName -> Object -> m a) -> Object -> m a

16211621fieldTagged f o = case HM.toList o of

16221622 [(k, Object o')] -> f (FieldName k) o'

16231623 _ -> fail "Expected object with 1 field-named key"

stack-8.10.yamlnew file+16

@@ -0,0 +1,16 @@

1+flags:

2+ bloodhound-examples:

3+ werror: true

5+packages:

6+ - '.'

7+ - './examples'

9+extra-deps:

10+ - quickcheck-arbitrary-template-0.2.1.1

11+ - quickcheck-properties-0.1

12+

13+resolver: lts-17.9

14+

15+nix:

16+ packages: [zlib]