on master help sign in
fix inconsistencies from rebase
commitbf637865cd234f9809cc8c4862ed851d55aade6f authorAlp Mestanogullari <alpmestan@gmail.com> dateSun 19 Apr 2015, 12:06 (11 years ago) parentf71c7a8
1 file changed+8−8
src/Servant/Server/Internal.hs+8−8
src/Servant/Server/Internal.hs+8−8
@@ -303,7 +303,7 @@ instance ( AllCTRender ctypes a
303303
304304-- '()' ==> 204 No Content
305305instance HasServer (Get ctypes ()) where
306− type ServerT (Get ctypes ()) m = m ()
306+ type ServerT' (Get ctypes ()) m = m ()
307307 route Proxy action request respond
308308 | pathIsEmpty request && requestMethod request == methodGet = do
309309 e <- runEitherT action
@@ -317,7 +317,7 @@ instance HasServer (Get ctypes ()) where
317317
318318-- Add response headers
319319instance ( AllCTRender ctypes v ) => HasServer (Get ctypes (Headers h v)) where
320− type ServerT (Get ctypes (Headers h v)) m = m (Headers h v)
320+ type ServerT' (Get ctypes (Headers h v)) m = m (Headers h v)
321321 route Proxy action request respond
322322 | pathIsEmpty request && requestMethod request == methodGet = do
323323 e <- runEitherT action
@@ -402,7 +402,7 @@ instance ( AllCTRender ctypes a
402402 | otherwise = respond $ failWith NotFound
403403
404404instance HasServer (Post ctypes ()) where
405− type ServerT (Post ctypes ()) m = m ()
405+ type ServerT' (Post ctypes ()) m = m ()
406406 route Proxy action request respond
407407 | pathIsEmpty request && requestMethod request == methodPost = do
408408 e <- runEitherT action
@@ -416,7 +416,7 @@ instance HasServer (Post ctypes ()) where
416416
417417-- Add response headers
418418instance ( AllCTRender ctypes v ) => HasServer (Post ctypes (Headers h v)) where
419− type ServerT (Post ctypes (Headers h v)) m = m (Headers h v)
419+ type ServerT' (Post ctypes (Headers h v)) m = m (Headers h v)
420420 route Proxy action request respond
421421 | pathIsEmpty request && requestMethod request == methodPost = do
422422 e <- runEitherT action
@@ -469,7 +469,7 @@ instance ( AllCTRender ctypes a
469469 | otherwise = respond $ failWith NotFound
470470
471471instance HasServer (Put ctypes ()) where
472− type ServerT (Put ctypes ()) m = m ()
472+ type ServerT' (Put ctypes ()) m = m ()
473473 route Proxy action request respond
474474 | pathIsEmpty request && requestMethod request == methodPut = do
475475 e <- runEitherT action
@@ -483,7 +483,7 @@ instance HasServer (Put ctypes ()) where
483483
484484-- Add response headers
485485instance ( AllCTRender ctypes v ) => HasServer (Put ctypes (Headers h v)) where
486− type ServerT (Put ctypes (Headers h v)) m = m (Headers h v)
486+ type ServerT' (Put ctypes (Headers h v)) m = m (Headers h v)
487487 route Proxy action request respond
488488 | pathIsEmpty request && requestMethod request == methodPut = do
489489 e <- runEitherT action
@@ -533,7 +533,7 @@ instance ( AllCTRender ctypes a
533533 | otherwise = respond $ failWith NotFound
534534
535535instance HasServer (Patch ctypes ()) where
536− type ServerT (Patch ctypes ()) m = m ()
536+ type ServerT' (Patch ctypes ()) m = m ()
537537 route Proxy action request respond
538538 | pathIsEmpty request && requestMethod request == methodPatch = do
539539 e <- runEitherT action
@@ -547,7 +547,7 @@ instance HasServer (Patch ctypes ()) where
547547
548548-- Add response headers
549549instance ( AllCTRender ctypes v ) => HasServer (Patch ctypes (Headers h v)) where
550− type ServerT (Patch ctypes (Headers h v)) m = m (Headers h v)
550+ type ServerT' (Patch ctypes (Headers h v)) m = m (Headers h v)
551551 route Proxy action request respond
552552 | pathIsEmpty request && requestMethod request == methodPatch = do
553553 e <- runEitherT action