@@ -1,5 +1,6 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DefaultSignatures #-}
3+{-# LANGUAGE DeriveDataTypeable #-}
34{-# LANGUAGE DeriveGeneric #-}
45{-# LANGUAGE FlexibleContexts #-}
56{-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -585,7 +586,7 @@ instance (ApproxEq l, Show l, ApproxEq r, Show r) => ApproxEq (Either l r) where
585586 Left a =~ Left b = a =~ b
586587 Right a =~ Right b = a =~ b
587588 _ =~ _ = False
588− showApproxEq (Left x) = "Left " <> showApproxEq x
589+ showApproxEq (Left x) = "Left " <> showApproxEq x
589590 showApproxEq (Right x) = "Right " <> showApproxEq x
590591instance ApproxEq NodeAttrFilter
591592instance ApproxEq NodeAttrName
@@ -665,8 +666,8 @@ getSource = fmap _source . foundResult
665666grabFirst :: Either EsError (SearchResult a) -> Either EsError a
666667grabFirst r =
667668 case fmap (hitSource . head . hits . searchHits) r of
668− (Left e) -> Left e
669− (Right Nothing) -> Left (EsError 500 "Source was missing")
669+ (Left e) -> Left e
670+ (Right Nothing) -> Left (EsError 500 "Source was missing")
670671 (Right (Just x)) -> Right x
671672
672673-------------------------------------------------------------------------------
@@ -903,7 +904,7 @@ $(derive makeArbitrary ''FsSnapshotRepo)
903904$(derive makeArbitrary ''SnapshotRepoName)
904905
905906newtype UpdatableIndexSetting' = UpdatableIndexSetting' UpdatableIndexSetting
906− deriving (Show, Eq, ToJSON, FromJSON, ApproxEq)
907+ deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)
907908
908909instance Arbitrary UpdatableIndexSetting' where
909910 arbitrary = do