Fix a couple of deprecation warnings

IHaskell · Mar 5, 2017 · 00478f3 · 00478f3 · thomasjm · Mar 13, 2017
1 parent 38ac12b
commit 00478f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ihaskell.cabal b/ihaskell.cabal
@@ -175,6 +175,7 @@ Test-Suite hspec
         ihaskell,
         here,
         hspec,
+        hspec-contrib,
         HUnit,
         ghc,
         ghc-paths,

diff --git a/src/IHaskell/Eval/Hoogle.hs b/src/IHaskell/Eval/Hoogle.hs
@@ -54,10 +54,10 @@ instance FromJSON HoogleResponse where
 -- an error message or the successful JSON result.
 query :: String -> IO (Either String String)
 query str = do
-  request <- parseUrl $ queryUrl $ urlEncode str
+  request <- parseUrlThrow $ queryUrl $ urlEncode str
+  mgr <- newManager tlsManagerSettings
   catch
-    (Right . CBS.unpack . LBS.toStrict . responseBody <$> withManager tlsManagerSettings
-                                                            (httpLbs request))
+    (Right . CBS.unpack . LBS.toStrict . responseBody <$> httpLbs request mgr)
     (\e -> return $ Left $ show (e :: SomeException))
 
   where

diff --git a/src/tests/IHaskell/Test/Parser.hs b/src/tests/IHaskell/Test/Parser.hs
@@ -7,7 +7,7 @@ import           Prelude
 import           Data.String.Here (hereLit)
 
 import           Test.Hspec
-import           Test.Hspec.HUnit
+import           Test.Hspec.Contrib.HUnit
 import           Test.HUnit (assertBool, assertFailure)
 
 import           IHaskell.Test.Util (ghc, strip)