git.iko.soy/servant
on master help sign in
Rename EmptyAPIServer to EmptyServer and add deriving clause
6feb27eDavid Turner
servant-server/src/Servant/Server.hs+1−1
compare with master
unifiedsplit
@@ -17,7 +17,7 @@ module Servant.Server
17 , -- * Handlers for all standard combinators
17 , -- * Handlers for all standard combinators
18 HasServer(..)
18 HasServer(..)
19 , Server
19 , Server
20− , EmptyAPIServer
20+ , EmptyServer
21 , emptyAPIServer
21 , emptyAPIServer
22 , Handler (..)
22 , Handler (..)
23 , runHandler
23 , runHandler
servant-server/src/Servant/Server/Internal.hs+4−4
@@ -532,12 +532,12 @@ instance HasServer api context => HasServer (HttpVersion :> api) context where
532 route Proxy context subserver =
532 route Proxy context subserver =
533 route (Proxy :: Proxy api) context (passToServer subserver httpVersion)
533 route (Proxy :: Proxy api) context (passToServer subserver httpVersion)
534
534
535−-- | Singleton type representing a server that serves an empty API
535+-- | Singleton type representing a server that serves an empty API.
536−data EmptyAPIServer = EmptyAPIServer
536+data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
537
537
538-- | Server for `EmptyAPI`
538-- | Server for `EmptyAPI`
539emptyAPIServer :: Server EmptyAPI
539emptyAPIServer :: Server EmptyAPI
540−emptyAPIServer = Tagged EmptyAPIServer
540+emptyAPIServer = Tagged EmptyServer
541
541
542-- | The server for an `EmptyAPI` is `emptyAPIServer`.
542-- | The server for an `EmptyAPI` is `emptyAPIServer`.
543--
543--
@@ -546,7 +546,7 @@ emptyAPIServer = Tagged EmptyAPIServer
546-- > server :: Server MyApi
546-- > server :: Server MyApi
547-- > server = emptyAPIServer
547-- > server = emptyAPIServer
548instance HasServer EmptyAPI context where
548instance HasServer EmptyAPI context where
549− type ServerT EmptyAPI m = Tagged m EmptyAPIServer
549+ type ServerT EmptyAPI m = Tagged m EmptyServer
550
550
551 route Proxy _ _ = StaticRouter mempty mempty
551 route Proxy _ _ = StaticRouter mempty mempty
552
552