From 1e703be15fad97b18ec387c32033a19723121d7f Mon Sep 17 00:00:00 2001
From: aaron levin <aaron.levin@soundcloud.com>
Date: Sun, 6 Mar 2016 21:16:28 +0100
Subject: [PATCH] replace serve with serveWithConfig

---
 servant-client/test/Servant/ClientSpec.hs       | 2 +-
 servant-examples/basic-auth/basic-auth.hs       | 4 ++--
 servant-server/test/Servant/Server/ErrorSpec.hs | 4 ++--
 servant-server/test/Servant/ServerSpec.hs       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/servant-client/test/Servant/ClientSpec.hs b/servant-client/test/Servant/ClientSpec.hs
index 291b9786..b6237b0e 100644
--- a/servant-client/test/Servant/ClientSpec.hs
+++ b/servant-client/test/Servant/ClientSpec.hs
@@ -170,7 +170,7 @@ serverConfig :: Config '[ BasicAuthCheck () ]
 serverConfig = basicAuthHandler :. EmptyConfig
 
 basicAuthServer :: Application
-basicAuthServer = serve basicAuthAPI serverConfig (const (return alice))
+basicAuthServer = serveWithConfig basicAuthAPI serverConfig (const (return alice))
 
 {-# NOINLINE manager #-}
 manager :: C.Manager
diff --git a/servant-examples/basic-auth/basic-auth.hs b/servant-examples/basic-auth/basic-auth.hs
index 1d538169..208edbb1 100644
--- a/servant-examples/basic-auth/basic-auth.hs
+++ b/servant-examples/basic-auth/basic-auth.hs
@@ -19,7 +19,7 @@ import           Servant.Server           (BasicAuthCheck (BasicAuthCheck),
                                                           , Unauthorized
                                                           ),
                                            Config ((:.), EmptyConfig), Server,
-                                           serve)
+                                           serveWithConfig)
 
 -- | let's define some types that our API returns.
 
@@ -80,7 +80,7 @@ server =
 
 -- | hello, server!
 main :: IO ()
-main = run 8080 (serve api serverConfig server)
+main = run 8080 (serveWithConfig api serverConfig server)
 
 {- Sample session
 
diff --git a/servant-server/test/Servant/Server/ErrorSpec.hs b/servant-server/test/Servant/Server/ErrorSpec.hs
index 5ae22361..3dce641d 100644
--- a/servant-server/test/Servant/Server/ErrorSpec.hs
+++ b/servant-server/test/Servant/Server/ErrorSpec.hs
@@ -56,7 +56,7 @@ errorOrderServer = \_ _ _ -> throwE err402
 errorOrderSpec :: Spec
 errorOrderSpec =
   describe "HTTP error order" $
-    with (return $ serve errorOrderApi
+    with (return $ serveWithConfig errorOrderApi
                    (errorOrderAuthCheck :. EmptyConfig)
                    errorOrderServer
          ) $ do
@@ -183,7 +183,7 @@ errorRetryServer
 errorRetrySpec :: Spec
 errorRetrySpec =
   describe "Handler search" $
-    with (return $ serve errorRetryApi
+    with (return $ serveWithConfig errorRetryApi
                          (errorOrderAuthCheck :. EmptyConfig)
                          errorRetryServer
          ) $ do
diff --git a/servant-server/test/Servant/ServerSpec.hs b/servant-server/test/Servant/ServerSpec.hs
index 71f1bd9f..763a16e2 100644
--- a/servant-server/test/Servant/ServerSpec.hs
+++ b/servant-server/test/Servant/ServerSpec.hs
@@ -347,13 +347,13 @@ headerSpec = describe "Servant.API.Header" $ do
         expectsString Nothing  = error "Expected a string"
 
     with (return (serve headerApi expectsInt)) $ do
-        let delete' x = Test.Hspec.Wai.request methodDelete x [("MyHeader", "5")]
+        let delete' x = THW.request methodDelete x [("MyHeader", "5")]
 
         it "passes the header to the handler (Int)" $
             delete' "/" "" `shouldRespondWith` 200
 
     with (return (serve headerApi expectsString)) $ do
-        let delete' x = Test.Hspec.Wai.request methodDelete x [("MyHeader", "more from you")]
+        let delete' x = THW.request methodDelete x [("MyHeader", "more from you")]
 
         it "passes the header to the handler (String)" $
             delete' "/" "" `shouldRespondWith` 200