7b0c801 · typeable/bloodhound

bloodhound.cabal+2−1

compare with master

unifiedsplit

@@ -39,7 +39,8 @@ library

39 exceptions,

40 data-default-class,

41 blaze-builder,

42− unordered-containers

42+ unordered-containers,

43+ mtl-compat

43 default-language: Haskell2010

44 default-language: Haskell2010

44

45

45test-suite tests

46test-suite tests

src/Database/Bloodhound/Client.hs+2−1

@@ -202,7 +202,8 @@ bindM2 f ma mb = join (f <$> ma <*> mb)

202-- settings in IO. If you've got your own monad transformer stack, you

203-- should use 'runBH' directly.

204withBH :: ManagerSettings -> Server -> BH IO a -> IO a

205−withBH ms s f = withManager ms $ \mgr -> do

205+withBH ms s f = do

206+ mgr <- newManager ms

206 let env = BHEnv { bhServer = s

207 let env = BHEnv { bhServer = s

207 , bhManager = mgr }

208 , bhManager = mgr }

208 runBH env f

209 runBH env f

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

@@ -231,7 +231,7 @@ module Database.Bloodhound.Types

231

232import Control.Applicative

233import Control.Monad.Catch

234−import Control.Monad.Error

234+import Control.Monad.Except

235import Control.Monad.Reader

236import Control.Monad.State

237import Control.Monad.Writer

src/Database/Bloodhound/Types/Class.hs+3

@@ -1,8 +1,11 @@

1+{-# LANGUAGE CPP #-}

1module Database.Bloodhound.Types.Class

2module Database.Bloodhound.Types.Class

2 ( Seminearring(..) )

3 ( Seminearring(..) )

3 where

4 where

4

5

6+#if !MIN_VERSION_base(4,8,0)

5import Data.Monoid

7import Data.Monoid

8+#endif

6

9

7class Monoid a => Seminearring a where

10class Monoid a => Seminearring a where

8 -- 0, +, *

11 -- 0, +, *