@@ -18,6 +18,7 @@
1818{-# LANGUAGE UndecidableInstances #-}
1919{-# OPTIONS_GHC -fcontext-stack=100 #-}
2020{-# OPTIONS_GHC -fno-warn-orphans #-}
21+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
2122
2223module Servant.ClientSpec where
2324
@@ -25,22 +26,26 @@ module Servant.ClientSpec where
2526import Control.Applicative ((<$>))
2627#endif
2728import Control.Arrow (left)
28−import Control.Concurrent
29−import Control.Exception
30−import Control.Monad.Trans.Except
29+import Control.Concurrent (forkIO, killThread, newEmptyMVar,
30+ putMVar, readMVar)
31+import Control.Exception (bracket, finally)
32+import Control.Monad.Trans.Except (ExceptT, runExceptT, throwE)
3133import Data.Aeson
3234import Data.Char
35+import Data.Char (chr, isPrint)
3336import Data.Foldable (forM_)
3437import Data.Monoid hiding (getLast)
3538import Data.Proxy
3639import qualified Data.Text as T
37−import GHC.Generics
40+import GHC.Generics (Generic)
3841import GHC.TypeLits
3942import qualified Network.HTTP.Client as C
4043import Network.HTTP.Media
41−import Network.HTTP.Types hiding (Header)
44+import Network.HTTP.Types (Method, Status (..), badRequest400,
45+ methodGet, ok200)
46+import qualified Network.HTTP.Types as HTTP
4247import Network.Socket
43−import Network.Wai hiding (Response)
48+import Network.Wai (Application, responseLBS)
4449import Network.Wai.Handler.Warp
4550import System.IO.Unsafe (unsafePerformIO)
4651import Test.Hspec
@@ -117,7 +122,7 @@ server = serve api (
117122 :<|> return
118123 :<|> (\ name -> case name of
119124 Just "alice" -> return alice
120− Just name -> throwE $ ServantErr 400 (name ++ " not found") "" []
125+ Just n -> throwE $ ServantErr 400 (n ++ " not found") "" []
121126 Nothing -> throwE $ ServantErr 400 "missing parameter" "" [])
122127 :<|> (\ names -> return (zipWith Person names [0..]))
123128 :<|> return