0e0ed4a · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Qualify some troublesome imports

commit0e0ed4a877e066aade56dabfe25f18af5c5d1eb5 authorMichael Xavier <michael@michaelxavier.net> dateWed 1 Feb 2017, 13:02 (10 years ago) parentedaac67

2 files changed+9−7

compare with master

unifiedsplit

src/Database/V1/Bloodhound/Types.hs+3−2 src/Database/V5/Bloodhound/Types.hs+6−5

src/Database/V1/Bloodhound/Types.hs+3−2

@@ -369,8 +369,9 @@ import Control.Applicative as A

369369import Control.Arrow (first)

370370import Control.Monad.Catch

371371import Control.Monad.Except

372−import Control.Monad.Reader

373−import Control.Monad.State

372+import Control.Monad.Reader (MonadReader (..),

373+ ReaderT (..))

374+import Control.Monad.State (MonadState)

374375import Control.Monad.Writer (MonadWriter)

375376import Data.Aeson

376377import Data.Aeson.Types (Pair, Parser,

src/Database/V5/Bloodhound/Types.hs+6−5

@@ -368,9 +368,10 @@ import Control.Applicative as A

368368import Control.Arrow (first)

369369import Control.Monad.Catch

370370import Control.Monad.Except

371−import Control.Monad.Reader

372−import Control.Monad.State

373−import Control.Monad.Writer

371+import Control.Monad.Reader (MonadReader (..),

372+ ReaderT (..))

373+import Control.Monad.State (MonadState)

374+import Control.Monad.Writer (MonadWriter)

374375import Data.Aeson

375376import Data.Aeson.Types (Pair, Parser,

376377 emptyObject,

@@ -1469,8 +1470,8 @@ data BoolQuery =

14691470 } deriving (Eq, Read, Show, Generic, Typeable)

14701471

14711472mkBoolQuery :: [Query] -> [Filter] -> [Query] -> [Query] -> BoolQuery

1472−mkBoolQuery must filter mustNot should =

1473− BoolQuery must filter mustNot should Nothing Nothing Nothing

1473+mkBoolQuery must filt mustNot should =

1474+ BoolQuery must filt mustNot should Nothing Nothing Nothing

14741475

14751476data BoostingQuery =

14761477 BoostingQuery { positiveQuery :: Query