eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename EmptyAPIServer to EmptyServer and add deriving clause

Browse source
This commit is contained in:
David Turner 2017-05-16 15:53:19 +00:00
parent 62560079b1
commit 6feb27e7b2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servant-server/src/Servant/Server.hs
View file

@ -17,7 +17,7 @@ module Servant.Server
, -- * Handlers for all standard combinators , -- * Handlers for all standard combinators
HasServer(..) HasServer(..)
, Server , Server
, EmptyAPIServer , EmptyServer
, emptyAPIServer , emptyAPIServer
, Handler (..) , Handler (..)
, runHandler , runHandler

8
servant-server/src/Servant/Server/Internal.hs
View file

@ -532,12 +532,12 @@ instance HasServer api context => HasServer (HttpVersion :> api) context where
route Proxy context subserver = route Proxy context subserver =
route (Proxy :: Proxy api) context (passToServer subserver httpVersion) route (Proxy :: Proxy api) context (passToServer subserver httpVersion)
-- | Singleton type representing a server that serves an empty API -- | Singleton type representing a server that serves an empty API.
data EmptyAPIServer = EmptyAPIServer data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
-- | Server for `EmptyAPI` -- | Server for `EmptyAPI`
emptyAPIServer :: Server EmptyAPI emptyAPIServer :: Server EmptyAPI
emptyAPIServer = Tagged EmptyAPIServer emptyAPIServer = Tagged EmptyServer
-- | The server for an `EmptyAPI` is `emptyAPIServer`. -- | The server for an `EmptyAPI` is `emptyAPIServer`.
-- --
@ -546,7 +546,7 @@ emptyAPIServer = Tagged EmptyAPIServer
-- > server :: Server MyApi -- > server :: Server MyApi
-- > server = emptyAPIServer -- > server = emptyAPIServer
instance HasServer EmptyAPI context where instance HasServer EmptyAPI context where
type ServerT EmptyAPI m = Tagged m EmptyAPIServer type ServerT EmptyAPI m = Tagged m EmptyServer
route Proxy _ _ = StaticRouter mempty mempty route Proxy _ _ = StaticRouter mempty mempty