0e0ed4a · typeable/bloodhound

git.iko.soy/typeable/bloodhound

on master help sign in

Qualify some troublesome imports

0e0ed4aMichael Xavier10 years ago

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

compare with master

unifiedsplit

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

369import Control.Arrow (first)

370import Control.Monad.Catch

371import Control.Monad.Except

372−import Control.Monad.Reader

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

373+ ReaderT (..))

373−import Control.Monad.State

374+import Control.Monad.State (MonadState)

374import Control.Monad.Writer (MonadWriter)

375import Control.Monad.Writer (MonadWriter)

375import Data.Aeson

376import Data.Aeson

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

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

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

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

368import Control.Arrow (first)

369import Control.Monad.Catch

370import Control.Monad.Except

371−import Control.Monad.Reader

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

372+ ReaderT (..))

372−import Control.Monad.State

373+import Control.Monad.State (MonadState)

373−import Control.Monad.Writer

374+import Control.Monad.Writer (MonadWriter)

374import Data.Aeson

375import Data.Aeson

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

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

376 emptyObject,

377 emptyObject,

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

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

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

1470

1471

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

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

1472−mkBoolQuery must filter mustNot should =

1473+mkBoolQuery must filt mustNot should =

1473− BoolQuery must filter mustNot should Nothing Nothing Nothing

1474+ BoolQuery must filt mustNot should Nothing Nothing Nothing

1474

1475

1475data BoostingQuery =

1476data BoostingQuery =

1476 BoostingQuery { positiveQuery :: Query

1477 BoostingQuery { positiveQuery :: Query