a948639 · typeable/servant

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

compare with master

unifiedsplit

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

43import Servant.Common.BaseUrl

44import Servant.Common.BasicAuth

45import Servant.Common.Req

46+import Servant.Utils.Enter

46

47

47-- * Accessing APIs as a Client

48-- * Accessing APIs as a Client

48

49

servant-server/servant-server.cabal−2

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

40 Servant.Server.Internal

41 Servant.Server.Internal.BasicAuth

42 Servant.Server.Internal.Context

43− Servant.Server.Internal.Enter

44 Servant.Server.Internal.Router

43 Servant.Server.Internal.Router

45 Servant.Server.Internal.RoutingApplication

44 Servant.Server.Internal.RoutingApplication

46 Servant.Server.Internal.ServantErr

45 Servant.Server.Internal.ServantErr

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

101 other-modules:

100 other-modules:

102 Servant.Server.ErrorSpec

101 Servant.Server.ErrorSpec

103 Servant.Server.Internal.ContextSpec

102 Servant.Server.Internal.ContextSpec

104− Servant.Server.Internal.EnterSpec

105 Servant.ServerSpec

103 Servant.ServerSpec

106 Servant.Server.UsingContextSpec

104 Servant.Server.UsingContextSpec

107 Servant.Server.UsingContextSpec.TestCombinators

105 Servant.Server.UsingContextSpec.TestCombinators

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

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

101import Data.Text (Text)

102import Network.Wai (Application)

103import Servant.Server.Internal

104−import Servant.Server.Internal.Enter

104+import Servant.Utils.Enter

105

106

107-- * Implementing Servers

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

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

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE TypeOperators #-}

4−module Servant.Server.Internal.EnterSpec where

4+module Servant.ArbitraryMonadServerSpec where

5

6import qualified Control.Category as C

7import Control.Monad.Reader

servant/servant.cabal+3

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

47 Servant.API.Verbs

48 Servant.API.WithNamedContext

49 Servant.Utils.Links

50+ Servant.Utils.Enter

50 build-depends:

51 build-depends:

51 base >= 4.7 && < 4.9

52 base >= 4.7 && < 4.9

52 , base-compat >= 0.9

53 , base-compat >= 0.9

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

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

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

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

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

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

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

62+ , mtl >= 2 && < 3

63+ , mmorph >= 1

61 , text >= 1 && < 2

64 , text >= 1 && < 2

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

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

63 , network-uri >= 2.6

66 , network-uri >= 2.6

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

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

8{-# LANGUAGE TypeFamilies #-}

9{-# LANGUAGE TypeOperators #-}

10{-# LANGUAGE UndecidableInstances #-}

11−module Servant.Server.Internal.Enter where

11+module Servant.Utils.Enter where

12

13import qualified Control.Category as C

14#if MIN_VERSION_mtl(2,2,1)