41d890d · typeable/bloodhound

bloodhound.cabal+4−4

compare with master

unifiedsplit

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

67 aeson >= 0.11.1,

68 blaze-builder,

69 bytestring >= 0.10.0 && <0.11,

70− containers >= 0.5.0.0 && <0.6,

70+ containers >= 0.5.0.0 && <0.7,

71 exceptions,

72 hashable,

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

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

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

75 mtl >= 1.0 && <2.3,

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

77 scientific >= 0.3.0.0 && <0.4.0.0,

78− semigroups >= 0.15 && <0.19,

78+ semigroups >= 0.15 && <0.20,

79 semver,

80 text >= 0.11 && <1.3,

81− time >= 1.4 && <1.9,

81+ time >= 1.4 && <1.10,

82 transformers >= 0.2 && <0.6,

83 unordered-containers,

84 vector >= 0.10.9 && <0.13

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

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

1552 toJSON Second = "second"

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

1554

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

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

1556parseStringInterval s = case span isNumber s of

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

1558 (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

1468 parse "all" = pure ZeroTermsAll

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

1470

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

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

1472fieldTagged f o = case HM.toList o of

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

1474 _ -> 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 {

62 } deriving ( Functor

63 , Applicative

64 , Monad

65+ , MonadFail

65 , MonadIO

66 , MonadIO

66 , MonadState s

67 , MonadState s

67 , MonadWriter w

68 , MonadWriter w

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

2331 toJSON Minute = "minute"

2332 toJSON Minute = "minute"

2332 toJSON Second = "second"

2333 toJSON Second = "second"

2333

2334

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

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

2335parseStringInterval s = case span isNumber s of

2336parseStringInterval s = case span isNumber s of

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

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

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

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

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

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

1617functionScoreFunctionsPair (FunctionScoreMultiple componentFns) =

1618 ("functions", toJSON componentFns)

1619

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

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

1621fieldTagged f o = case HM.toList o of

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

1623 _ -> 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

4+

5+packages:

6+ - '.'

7+ - './examples'

8+

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]