a948639 · typeable/servant

git.iko.soy/typeable/servant

Move enter to servant package

commita948639673ffbb0a1c90f9331ec597e8230d0de3 authorAmar <amar@capital-match.com> dateThu 21 Apr 2016, 19:31 (10 years ago) parent4f4ca69

6 files changed+7−5

compare with master

unifiedsplit

servant-client/src/Servant/Client.hs+1 servant-server/servant-server.cabal−2 servant-server/src/Servant/Server.hs+1−1 servant-server/test/Servant/Server/Internal/EnterSpec.hs → servant-server/test/Servant/ArbitraryMonadServerSpec.hs+1−1 servant/servant.cabal+3 servant-server/src/Servant/Server/Internal/Enter.hs → servant/src/Servant/Utils/Enter.hs+1−1

servant-client/src/Servant/Client.hs+1

@@ -43,6 +43,7 @@ import Servant.Client.Experimental.Auth

4343import Servant.Common.BaseUrl

4444import Servant.Common.BasicAuth

4545import Servant.Common.Req

46+import Servant.Utils.Enter

4647

4748-- * Accessing APIs as a Client

4849

servant-server/servant-server.cabal−2

@@ -40,7 +40,6 @@ library

4040 Servant.Server.Internal

4141 Servant.Server.Internal.BasicAuth

4242 Servant.Server.Internal.Context

43− Servant.Server.Internal.Enter

4443 Servant.Server.Internal.Router

4544 Servant.Server.Internal.RoutingApplication

4645 Servant.Server.Internal.ServantErr

@@ -101,7 +100,6 @@ test-suite spec

101100 other-modules:

102101 Servant.Server.ErrorSpec

103102 Servant.Server.Internal.ContextSpec

104− Servant.Server.Internal.EnterSpec

105103 Servant.ServerSpec

106104 Servant.Server.UsingContextSpec

107105 Servant.Server.UsingContextSpec.TestCombinators

servant-server/src/Servant/Server.hs+1−1

@@ -101,7 +101,7 @@ import Data.Proxy (Proxy)

101101import Data.Text (Text)

102102import Network.Wai (Application)

103103import Servant.Server.Internal

104−import Servant.Server.Internal.Enter

104+import Servant.Utils.Enter

105105

106106

107107-- * Implementing Servers

servant-server/test/Servant/Server/Internal/EnterSpec.hs → servant-server/test/Servant/ArbitraryMonadServerSpec.hsrenamed+1−1

@@ -1,7 +1,7 @@

11{-# LANGUAGE DataKinds #-}

22{-# LANGUAGE OverloadedStrings #-}

33{-# LANGUAGE TypeOperators #-}

4−module Servant.Server.Internal.EnterSpec where

4+module Servant.ArbitraryMonadServerSpec where

66import qualified Control.Category as C

77import Control.Monad.Reader

servant/servant.cabal+3

@@ -47,6 +47,7 @@ library

4747 Servant.API.Verbs

4848 Servant.API.WithNamedContext

4949 Servant.Utils.Links

50+ Servant.Utils.Enter

5051 build-depends:

5152 base >= 4.7 && < 4.9

5253 , base-compat >= 0.9

@@ -58,6 +59,8 @@ library

5859 , http-api-data >= 0.1 && < 0.3

5960 , http-media >= 0.4 && < 0.7

6061 , http-types >= 0.8 && < 0.10

62+ , mtl >= 2 && < 3

63+ , mmorph >= 1

6164 , text >= 1 && < 2

6265 , string-conversions >= 0.3 && < 0.5

6366 , network-uri >= 2.6

servant-server/src/Servant/Server/Internal/Enter.hs → servant/src/Servant/Utils/Enter.hsrenamed+1−1

@@ -8,7 +8,7 @@

88{-# LANGUAGE TypeFamilies #-}

99{-# LANGUAGE TypeOperators #-}

1010{-# LANGUAGE UndecidableInstances #-}

11−module Servant.Server.Internal.Enter where

11+module Servant.Utils.Enter where

1212

1313import qualified Control.Category as C

1414#if MIN_VERSION_mtl(2,2,1)