@@ -1,25 +1,24 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE ConstraintKinds #-}
3−{-# LANGUAGE DataKinds #-}
4−{-# LANGUAGE DeriveDataTypeable #-}
5−{-# LANGUAGE FlexibleContexts #-}
6−{-# LANGUAGE FlexibleInstances #-}
7−{-# LANGUAGE MultiParamTypeClasses #-}
8−{-# LANGUAGE OverloadedStrings #-}
9−{-# LANGUAGE PolyKinds #-}
10−{-# LANGUAGE RankNTypes #-}
11−{-# LANGUAGE ScopedTypeVariables #-}
12−{-# LANGUAGE TupleSections #-}
13−{-# LANGUAGE TypeFamilies #-}
14−{-# LANGUAGE TypeOperators #-}
15−{-# LANGUAGE UndecidableInstances #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE DeriveDataTypeable #-}
5+{-# LANGUAGE FlexibleContexts #-}
6+{-# LANGUAGE FlexibleInstances #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE RankNTypes #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE TupleSections #-}
13+{-# LANGUAGE TypeFamilies #-}
14+{-# LANGUAGE TypeOperators #-}
1615
1716#if MIN_VERSION_base(4,9,0) && __GLASGOW_HASKELL__ >= 802
1817#define HAS_TYPE_ERROR
1918#endif
2019
2120#ifdef HAS_TYPE_ERROR
22−{-# LANGUAGE UndecidableInstances #-}
21+{-# LANGUAGE UndecidableInstances #-}
2322#endif
2423
2524#include "overlapping-compat.h"
@@ -34,73 +33,74 @@ module Servant.Server.Internal
3433 , module Servant.Server.Internal.ServantErr
3534 ) where
3635
37−import Control.Monad (join, when)
38−import Control.Monad.Trans (liftIO)
39−import Control.Monad.Trans.Resource (runResourceT)
40−import qualified Data.ByteString as B
41−import qualified Data.ByteString.Builder as BB
42−import qualified Data.ByteString.Char8 as BC8
43−import qualified Data.ByteString.Lazy as BL
44−import Data.Maybe (fromMaybe, mapMaybe,
45− isNothing, maybeToList)
46−import Data.Either (partitionEithers)
47−import qualified Data.Map.Strict as Map
48−import Data.String (IsString (..))
49−import Data.String.Conversions (cs, (<>))
50−import Data.Tagged (Tagged(..), retag, untag)
51−import qualified Data.Text as T
36+import Control.Monad
37+ (join, when)
38+import Control.Monad.Trans
39+ (liftIO)
40+import Control.Monad.Trans.Resource
41+ (runResourceT)
42+import qualified Data.ByteString as B
43+import qualified Data.ByteString.Builder as BB
44+import qualified Data.ByteString.Char8 as BC8
45+import qualified Data.ByteString.Lazy as BL
46+import Data.Either
47+ (partitionEithers)
48+import qualified Data.Map.Strict as Map
49+import Data.Maybe
50+ (fromMaybe, isNothing, mapMaybe, maybeToList)
51+import Data.String
52+ (IsString (..))
53+import Data.String.Conversions
54+ (cs, (<>))
55+import Data.Tagged
56+ (Tagged (..), retag, untag)
57+import qualified Data.Text as T
5258import Data.Typeable
53−import GHC.TypeLits (KnownNat, KnownSymbol, natVal,
54− symbolVal)
55−import Network.HTTP.Types hiding (Header, ResponseHeaders)
56−import qualified Network.HTTP.Media as NHM
57−import Network.Socket (SockAddr)
58−import Network.Wai (Application, Request,
59− httpVersion, isSecure,
60− lazyRequestBody,
61− rawQueryString, remoteHost,
62− requestHeaders, requestMethod,
63− responseLBS, responseStream,
64− vault)
65−import Prelude ()
59+import GHC.TypeLits
60+ (KnownNat, KnownSymbol, natVal, symbolVal)
61+import qualified Network.HTTP.Media as NHM
62+import Network.HTTP.Types hiding
63+ (Header, ResponseHeaders)
64+import Network.Socket
65+ (SockAddr)
66+import Network.Wai
67+ (Application, Request, httpVersion, isSecure, lazyRequestBody,
68+ rawQueryString, remoteHost, requestHeaders, requestMethod,
69+ responseLBS, responseStream, vault)
70+import Prelude ()
6671import Prelude.Compat
67−import Web.HttpApiData (FromHttpApiData, parseHeader,
68− parseQueryParam,
69− parseUrlPieceMaybe,
70− parseUrlPieces)
71−import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture',
72− CaptureAll, Verb, EmptyAPI,
73− ReflectMethod(reflectMethod),
74− IsSecure(..), Header', QueryFlag,
75− QueryParam', QueryParams, Raw,
76− RemoteHost, ReqBody', Vault,
77− WithNamedContext,
78− Description, Summary,
79− Accept(..),
80− FramingRender(..), Stream,
81− StreamGenerator(..), ToStreamGenerator(..),
82− BoundaryStrategy(..),
83− If, SBool (..), SBoolI (..))
84−import Servant.API.Modifiers (unfoldRequestArgument, RequestArgument, FoldRequired, FoldLenient)
85−import Servant.API.ContentTypes (AcceptHeader (..),
86− AllCTRender (..),
87− AllCTUnrender (..),
88− AllMime,
89− MimeRender(..),
90− canHandleAcceptH)
91−import Servant.API.ResponseHeaders (GetHeaders, Headers, getHeaders,
92− getResponse, DynHeaders,
93− DynResponse, withDynHeaders)
72+import Servant.API
73+ ((:<|>) (..), (:>), Accept (..), BasicAuth,
74+ BoundaryStrategy (..), Capture', CaptureAll, Description,
75+ EmptyAPI, FramingRender (..), Header', If, IsSecure (..),
76+ QueryFlag, QueryParam', QueryParams, Raw,
77+ ReflectMethod (reflectMethod), RemoteHost, ReqBody',
78+ SBool (..), SBoolI (..), Stream, StreamGenerator (..),
79+ Summary, ToStreamGenerator (..), Vault, Verb,
80+ WithNamedContext)
81+import Servant.API.ContentTypes
82+ (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
83+ AllMime, MimeRender (..), canHandleAcceptH)
84+import Servant.API.Modifiers
85+ (FoldLenient, FoldRequired, RequestArgument,
86+ unfoldRequestArgument)
87+import Servant.API.ResponseHeaders
88+ (DynHeaders (..), GetHeaders, Headers, getHeaders,
89+ getResponse)
90+import Web.HttpApiData
91+ (FromHttpApiData, parseHeader, parseQueryParam,
92+ parseUrlPieceMaybe, parseUrlPieces)
9493
95−import Servant.Server.Internal.Context
9694import Servant.Server.Internal.BasicAuth
95+import Servant.Server.Internal.Context
9796import Servant.Server.Internal.Handler
9897import Servant.Server.Internal.Router
9998import Servant.Server.Internal.RoutingApplication
10099import Servant.Server.Internal.ServantErr
101100
102101#ifdef HAS_TYPE_ERROR
103−import GHC.TypeLits (TypeError, ErrorMessage (..))
102+import GHC.TypeLits
103+ (ErrorMessage (..), TypeError)
104104#endif
105105
106106class HasServer api context where
@@ -286,7 +286,7 @@ instance OVERLAPPING_
286286 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
287287 ) => HasServer (Verb method status ctypes (DynHeaders a)) context where
288288
289− type ServerT (Verb method status ctypes (DynHeaders a)) m = m (DynResponse a)
289+ type ServerT (Verb method status ctypes (DynHeaders a)) m = m (DynHeaders a)
290290 hoistServerWithContext _ _ nt s = nt s
291291
292292 route Proxy _ = methodRouter (\x -> (Map.toList (dynHeaders x), dynResponse x))
@@ -771,7 +771,7 @@ instance (HasContextEntry context (NamedContext name subContext), HasServer subA
771771-- ...Maybe you haven't applied enough arguments to
772772-- ...Capture' '[] "foo"
773773-- ...
774−--
774+--
775775instance TypeError (HasServerArrowKindError arr) => HasServer ((arr :: k -> l) :> api) context
776776 where
777777 type ServerT (arr :> api) m = TypeError (HasServerArrowKindError arr)