6357679 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Fix incompatibility with uri-bytestring api

commit635767905134b486059a0d3cc187da288e6caf37 authorMichael Xavier <michael@michaelxavier.net> dateWed 15 Apr 2015, 11:21 (12 years ago) parent36fe6d3

2 files changed+2−4

compare with master

unifiedsplit

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

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

@@ -55,11 +55,9 @@ import Control.Monad

5555import Control.Monad.Catch

5656import Control.Monad.IO.Class

5757import Data.Aeson

58−import qualified Data.ByteString.Char8 as B8

5958import Data.ByteString.Lazy.Builder

6059import qualified Data.ByteString.Lazy.Char8 as L

6160import Data.Default.Class

62−import Data.List (intercalate)

6361import Data.Maybe (fromMaybe)

6462import Data.Text (Text)

6563import qualified Data.Text as T

@@ -70,7 +68,6 @@ import qualified Network.HTTP.Types.Method as NHTM

7068import qualified Network.HTTP.Types.Status as NHTS

7169import Prelude hiding (filter, head)

7270import URI.ByteString hiding (Query)

73−import qualified URI.ByteString as UB

7471

7572import Database.Bloodhound.Types

7673

@@ -526,7 +523,7 @@ setURI req URI{..} = do

526523 , port = thePort

527524 , path = uriPath

528525 }

529− thePort = maybe defPort (read . B8.unpack . getPort) authorityPort

526+ thePort = maybe defPort getPort authorityPort

530527 addAuth = maybe id addAuth' authorityUserInfo

531528 return $ setQueryString theQueryString $ addAuth req'

532529 where

src/Database/Bloodhound/Types.hs+1

@@ -258,6 +258,7 @@ newtype BH m a = BH {

258258 , MonadState s

259259 , MonadWriter w

260260 , MonadError e

261+ , Alternative

261262 , MonadPlus

262263 , MonadFix)

263264