From b4372b5c148f6ff8d359295a86eecf397c306439 Mon Sep 17 00:00:00 2001 From: Catherine Galkina Date: Sun, 8 Sep 2019 15:04:18 +0300 Subject: [PATCH] Removed unnecessary OVERLAPPING/OVERLAPPABLE pragmas --- servant-client-core/src/Servant/Client/Core/HasClient.hs | 5 ++--- servant-server/src/Servant/Server/Internal.hs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/servant-client-core/src/Servant/Client/Core/HasClient.hs b/servant-client-core/src/Servant/Client/Core/HasClient.hs index 879aff31..78307244 100644 --- a/servant-client-core/src/Servant/Client/Core/HasClient.hs +++ b/servant-client-core/src/Servant/Client/Core/HasClient.hs @@ -242,9 +242,8 @@ instance {-# OVERLAPPING #-} hoistClientMonad _ _ f ma = f ma -instance {-# OVERLAPPING #-} - ( RunClient m, ReflectMethod method - ) => HasClient m (NoContentVerb method) where +instance (RunClient m, ReflectMethod method) => + HasClient m (NoContentVerb method) where type Client m (NoContentVerb method) = m NoContent clientWithRoute _pm Proxy req = do diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs index 196895cf..b9a94035 100644 --- a/servant-server/src/Servant/Server/Internal.hs +++ b/servant-server/src/Servant/Server/Internal.hs @@ -298,9 +298,8 @@ instance {-# OVERLAPPING #-} where method = reflectMethod (Proxy :: Proxy method) status = toEnum . fromInteger $ natVal (Proxy :: Proxy status) -instance {-# OVERLAPPABLE #-} - (ReflectMethod method - ) => HasServer (NoContentVerb method) context where +instance (ReflectMethod method) => + HasServer (NoContentVerb method) context where type ServerT (NoContentVerb method) m = m NoContent hoistServerWithContext _ _ nt s = nt s