git.iko.soy/typeable/bloodhound
on master help sign in
Update for newest uri-bytestring
commita59f9a92ff616db01bc874989b2640cc8700ec9d authorMichael Xavier <michael@michaelxavier.net> dateMon 11 May 2015, 09:32 (11 years ago) parentcb9d9f6
2 files changed+26−26
bloodhound.cabal+23−23 src/Database/Bloodhound/Client.hs+3−3
bloodhound.cabal+23−23
@@ -39,7 +39,7 @@ library
3939 transformers >= 0.2 && <0.5,
4040 http-types >= 0.8 && <0.9,
4141 vector >= 0.10.9 && <0.11,
42− uri-bytestring >= 0.0.1 && <0.1,
42+ uri-bytestring >= 0.1 && <0.2,
4343 exceptions,
4444 data-default-class
4545 default-language: Haskell2010
@@ -49,23 +49,20 @@ test-suite tests
4949 type: exitcode-stdio-1.0
5050 main-is: tests.hs
5151 hs-source-dirs: tests
52− if impl(ghc >= 7.8)
53− build-depends: base,
54− bloodhound,
55− http-client,
56− http-types,
57− containers,
58− hspec >= 1.8 && <2.1,
59− text,
60− time,
61− aeson,
62− semigroups,
63− QuickCheck,
64− vector,
65− unordered-containers >= 0.2.5.0 && <0.3,
66− mtl
67− else
68− buildable: False
52+ build-depends: base,
53+ bloodhound,
54+ http-client,
55+ http-types,
56+ containers,
57+ hspec >= 1.8 && <2.1,
58+ text,
59+ time,
60+ aeson,
61+ semigroups,
62+ QuickCheck,
63+ vector,
64+ unordered-containers >= 0.2.5.0 && <0.3,
65+ mtl
6966 default-language: Haskell2010
7067
7168test-suite doctests
@@ -73,8 +70,11 @@ test-suite doctests
7370 type: exitcode-stdio-1.0
7471 main-is: doctests.hs
7572 hs-source-dirs: tests
76− build-depends: base,
77− directory,
78− doctest,
79− doctest-prop,
80− filepath
73+ if impl(ghc >= 7.8)
74+ build-depends: base,
75+ directory,
76+ doctest,
77+ doctest-prop,
78+ filepath
79+ else
80+ buildable: False
src/Database/Bloodhound/Client.hs+3−3
@@ -519,11 +519,11 @@ setURI :: MonadThrow m => Request -> URI -> m Request
519519setURI req URI{..} = do
520520 Authority {..} <- maybe missingUA return uriAuthority
521521 let req' = req { secure = isSecure
522− , host = getHost authorityHost
522+ , host = hostBS authorityHost
523523 , port = thePort
524524 , path = uriPath
525525 }
526− thePort = maybe defPort getPort authorityPort
526+ thePort = maybe defPort portNumber authorityPort
527527 addAuth = maybe id addAuth' authorityUserInfo
528528 return $ setQueryString theQueryString $ addAuth req'
529529 where
@@ -535,4 +535,4 @@ setURI req URI{..} = do
535535 isSecure = case uriScheme of
536536 Scheme "https" -> True
537537 _ -> False
538− theQueryString = [(k , Just v) | (k, v) <- getQuery uriQuery]
538+ theQueryString = [(k , Just v) | (k, v) <- queryPairs uriQuery]