@@ -1,27 +1,23 @@
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 #-}
15+{-# LANGUAGE UndecidableInstances #-}
1616
1717#if MIN_VERSION_base(4,9,0) && __GLASGOW_HASKELL__ >= 802
1818#define HAS_TYPE_ERROR
1919#endif
2020
21−#ifdef HAS_TYPE_ERROR
22−{-# LANGUAGE UndecidableInstances #-}
23−#endif
24−
2521#include "overlapping-compat.h"
2622
2723module Servant.Server.Internal
@@ -34,72 +30,74 @@ module Servant.Server.Internal
3430 , module Servant.Server.Internal.ServantErr
3531 ) where
3632
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 Data.Semigroup ((<>))
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
33+import Control.Monad
34+ (join, when)
35+import Control.Monad.Trans
36+ (liftIO)
37+import Control.Monad.Trans.Resource
38+ (runResourceT)
39+import qualified Data.ByteString as B
40+import qualified Data.ByteString.Builder as BB
41+import qualified Data.ByteString.Char8 as BC8
42+import qualified Data.ByteString.Lazy as BL
43+import Data.Either
44+ (partitionEithers)
45+import Data.Maybe
46+ (fromMaybe, isNothing, mapMaybe, maybeToList)
47+import Data.Semigroup
48+ ((<>))
49+import Data.String
50+ (IsString (..))
51+import Data.String.Conversions
52+ (cs)
53+import Data.Tagged
54+ (Tagged (..), retag, untag)
55+import qualified Data.Text as T
5256import 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 ()
57+import GHC.TypeLits
58+ (KnownNat, KnownSymbol, natVal, symbolVal)
59+import qualified Network.HTTP.Media as NHM
60+import Network.HTTP.Types hiding
61+ (Header, ResponseHeaders)
62+import Network.Socket
63+ (SockAddr)
64+import Network.Wai
65+ (Application, Request, httpVersion, isSecure, lazyRequestBody,
66+ rawQueryString, remoteHost, requestHeaders, requestMethod,
67+ responseLBS, responseStream, vault)
68+import Prelude ()
6669import 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)
70+import Servant.API
71+ ((:<|>) (..), (:>), Accept (..), BasicAuth,
72+ BoundaryStrategy (..), Capture', CaptureAll, Description,
73+ EmptyAPI, FramingRender (..), Header', If, IsSecure (..),
74+ QueryFlag, QueryParam', QueryParams, Raw,
75+ ReflectMethod (reflectMethod), RemoteHost, ReqBody',
76+ SBool (..), SBoolI (..), Stream, StreamGenerator (..),
77+ Summary, ToStreamGenerator (..), Vault, Verb,
78+ WithNamedContext)
79+import Servant.API.ContentTypes
80+ (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
81+ AllMime, MimeRender (..), canHandleAcceptH)
82+import Servant.API.Modifiers
83+ (FoldLenient, FoldRequired, RequestArgument,
84+ unfoldRequestArgument)
85+import Servant.API.ResponseHeaders
86+ (GetHeaders, Headers, getHeaders, getResponse)
87+import Web.HttpApiData
88+ (FromHttpApiData, parseHeader, parseQueryParam,
89+ parseUrlPieceMaybe, parseUrlPieces)
9390
94−import Servant.Server.Internal.Context
9591import Servant.Server.Internal.BasicAuth
92+import Servant.Server.Internal.Context
9693import Servant.Server.Internal.Handler
9794import Servant.Server.Internal.Router
9895import Servant.Server.Internal.RoutingApplication
9996import Servant.Server.Internal.ServantErr
10097
10198#ifdef HAS_TYPE_ERROR
102−import GHC.TypeLits (TypeError, ErrorMessage (..))
99+import GHC.TypeLits
100+ (ErrorMessage (..), TypeError)
103101#endif
104102
105103class HasServer api context where
@@ -762,7 +760,7 @@ instance (HasContextEntry context (NamedContext name subContext), HasServer subA
762760-- ...Maybe you haven't applied enough arguments to
763761-- ...Capture' '[] "foo"
764762-- ...
765−--
763+--
766764instance TypeError (HasServerArrowKindError arr) => HasServer ((arr :: k -> l) :> api) context
767765 where
768766 type ServerT (arr :> api) m = TypeError (HasServerArrowKindError arr)