From 6feb27e7b25f43ee71e47af5c047bf2dd2f312c1 Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 16 May 2017 15:53:19 +0000 Subject: [PATCH] Rename EmptyAPIServer to EmptyServer and add deriving clause --- servant-server/src/Servant/Server.hs | 2 +- servant-server/src/Servant/Server/Internal.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/servant-server/src/Servant/Server.hs b/servant-server/src/Servant/Server.hs index 212277e2..c3e1c90a 100644 --- a/servant-server/src/Servant/Server.hs +++ b/servant-server/src/Servant/Server.hs @@ -17,7 +17,7 @@ module Servant.Server , -- * Handlers for all standard combinators HasServer(..) , Server - , EmptyAPIServer + , EmptyServer , emptyAPIServer , Handler (..) , runHandler diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs index 057e3f19..f343f038 100644 --- a/servant-server/src/Servant/Server/Internal.hs +++ b/servant-server/src/Servant/Server/Internal.hs @@ -532,12 +532,12 @@ instance HasServer api context => HasServer (HttpVersion :> api) context where route Proxy context subserver = route (Proxy :: Proxy api) context (passToServer subserver httpVersion) --- | Singleton type representing a server that serves an empty API -data EmptyAPIServer = EmptyAPIServer +-- | Singleton type representing a server that serves an empty API. +data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum) -- | Server for `EmptyAPI` emptyAPIServer :: Server EmptyAPI -emptyAPIServer = Tagged EmptyAPIServer +emptyAPIServer = Tagged EmptyServer -- | The server for an `EmptyAPI` is `emptyAPIServer`. -- @@ -546,7 +546,7 @@ emptyAPIServer = Tagged EmptyAPIServer -- > server :: Server MyApi -- > server = emptyAPIServer instance HasServer EmptyAPI context where - type ServerT EmptyAPI m = Tagged m EmptyAPIServer + type ServerT EmptyAPI m = Tagged m EmptyServer route Proxy _ _ = StaticRouter mempty mempty