05a9094 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Merge pull request #186 from tmcgilchrist/topic/fixup_warnings

Fixup warnings about unused function and redundant constraints.

commit05a9094d858f09f9f78444af5550d68a5ac6ce1c authorChris Allen <cma@bitemyapp.com> dateTue 6 Jun 2017, 16:52 (9 years ago) parent79b4f90 029d91e

2 files changed+2−8

unifiedsplit

src/Database/V1/Bloodhound/Types.hs+1−4

@@ -5460,9 +5460,6 @@ instance FromJSON PhraseSuggesterCollate where

54605460 return $ PhraseSuggesterCollate (TemplateQueryInline inline' params') prune'

54615461 parseJSON x = typeMismatch "PhraseSuggesterCollate" x

54625462

5463−mkPhraseSuggesterCollate :: TemplateQueryInline -> PhraseSuggesterCollate

5464−mkPhraseSuggesterCollate tQuery = PhraseSuggesterCollate tQuery False

5465−

54665463data SuggestOptions =

54675464 SuggestOptions { suggestOptionsText :: Text

54685465 , suggestOptionsScore :: Double

@@ -5509,4 +5506,4 @@ instance FromJSON NamedSuggestionResponse where

55095506 suggestionResponses' <- o .: suggestionName'

55105507 return $ NamedSuggestionResponse suggestionName' suggestionResponses'

55115508

5512− parseJSON x = typeMismatch "NamedSuggestionResponse" x

5509+ parseJSON x = typeMismatch "NamedSuggestionResponse" x

src/Database/V5/Bloodhound/Types.hs+1−4

@@ -2098,7 +2098,7 @@ instance BucketAggregation DateRangeResult where

20982098 docCount = dateRangeDocCount

20992099 aggs = dateRangeAggs

21002100

2101−instance (FromJSON a, BucketAggregation a) => FromJSON (Bucket a) where

2101+instance (FromJSON a) => FromJSON (Bucket a) where

21022102 parseJSON (Object v) = Bucket <$>

21032103 v .: "buckets"

21042104 parseJSON _ = mempty

@@ -5238,9 +5238,6 @@ instance FromJSON PhraseSuggesterCollate where

52385238 return $ PhraseSuggesterCollate (TemplateQueryInline inline' params') prune'

52395239 parseJSON x = typeMismatch "PhraseSuggesterCollate" x

52405240

5241−mkPhraseSuggesterCollate :: TemplateQueryInline -> PhraseSuggesterCollate

5242−mkPhraseSuggesterCollate tQuery = PhraseSuggesterCollate tQuery False

5243−

52445241data SuggestOptions =

52455242 SuggestOptions { suggestOptionsText :: Text

52465243 , suggestOptionsScore :: Double