git.iko.soy/servant
on master help sign in
fix inconsistencies from rebase
bf63786Alp Mestanogullari
src/Servant/Server/Internal.hs+8−8
compare with master
unifiedsplit
@@ -303,7 +303,7 @@ instance ( AllCTRender ctypes a
303
303
304-- '()' ==> 204 No Content
304-- '()' ==> 204 No Content
305instance HasServer (Get ctypes ()) where
305instance HasServer (Get ctypes ()) where
306− type ServerT (Get ctypes ()) m = m ()
306+ type ServerT' (Get ctypes ()) m = m ()
307 route Proxy action request respond
307 route Proxy action request respond
308 | pathIsEmpty request && requestMethod request == methodGet = do
308 | pathIsEmpty request && requestMethod request == methodGet = do
309 e <- runEitherT action
309 e <- runEitherT action
@@ -317,7 +317,7 @@ instance HasServer (Get ctypes ()) where
317
317
318-- Add response headers
318-- Add response headers
319instance ( AllCTRender ctypes v ) => HasServer (Get ctypes (Headers h v)) where
319instance ( 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)
321 route Proxy action request respond
321 route Proxy action request respond
322 | pathIsEmpty request && requestMethod request == methodGet = do
322 | pathIsEmpty request && requestMethod request == methodGet = do
323 e <- runEitherT action
323 e <- runEitherT action
@@ -402,7 +402,7 @@ instance ( AllCTRender ctypes a
402 | otherwise = respond $ failWith NotFound
402 | otherwise = respond $ failWith NotFound
403
403
404instance HasServer (Post ctypes ()) where
404instance HasServer (Post ctypes ()) where
405− type ServerT (Post ctypes ()) m = m ()
405+ type ServerT' (Post ctypes ()) m = m ()
406 route Proxy action request respond
406 route Proxy action request respond
407 | pathIsEmpty request && requestMethod request == methodPost = do
407 | pathIsEmpty request && requestMethod request == methodPost = do
408 e <- runEitherT action
408 e <- runEitherT action
@@ -416,7 +416,7 @@ instance HasServer (Post ctypes ()) where
416
416
417-- Add response headers
417-- Add response headers
418instance ( AllCTRender ctypes v ) => HasServer (Post ctypes (Headers h v)) where
418instance ( 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)
420 route Proxy action request respond
420 route Proxy action request respond
421 | pathIsEmpty request && requestMethod request == methodPost = do
421 | pathIsEmpty request && requestMethod request == methodPost = do
422 e <- runEitherT action
422 e <- runEitherT action
@@ -469,7 +469,7 @@ instance ( AllCTRender ctypes a
469 | otherwise = respond $ failWith NotFound
469 | otherwise = respond $ failWith NotFound
470
470
471instance HasServer (Put ctypes ()) where
471instance HasServer (Put ctypes ()) where
472− type ServerT (Put ctypes ()) m = m ()
472+ type ServerT' (Put ctypes ()) m = m ()
473 route Proxy action request respond
473 route Proxy action request respond
474 | pathIsEmpty request && requestMethod request == methodPut = do
474 | pathIsEmpty request && requestMethod request == methodPut = do
475 e <- runEitherT action
475 e <- runEitherT action
@@ -483,7 +483,7 @@ instance HasServer (Put ctypes ()) where
483
483
484-- Add response headers
484-- Add response headers
485instance ( AllCTRender ctypes v ) => HasServer (Put ctypes (Headers h v)) where
485instance ( 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)
487 route Proxy action request respond
487 route Proxy action request respond
488 | pathIsEmpty request && requestMethod request == methodPut = do
488 | pathIsEmpty request && requestMethod request == methodPut = do
489 e <- runEitherT action
489 e <- runEitherT action
@@ -533,7 +533,7 @@ instance ( AllCTRender ctypes a
533 | otherwise = respond $ failWith NotFound
533 | otherwise = respond $ failWith NotFound
534
534
535instance HasServer (Patch ctypes ()) where
535instance HasServer (Patch ctypes ()) where
536− type ServerT (Patch ctypes ()) m = m ()
536+ type ServerT' (Patch ctypes ()) m = m ()
537 route Proxy action request respond
537 route Proxy action request respond
538 | pathIsEmpty request && requestMethod request == methodPatch = do
538 | pathIsEmpty request && requestMethod request == methodPatch = do
539 e <- runEitherT action
539 e <- runEitherT action
@@ -547,7 +547,7 @@ instance HasServer (Patch ctypes ()) where
547
547
548-- Add response headers
548-- Add response headers
549instance ( AllCTRender ctypes v ) => HasServer (Patch ctypes (Headers h v)) where
549instance ( 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)
551 route Proxy action request respond
551 route Proxy action request respond
552 | pathIsEmpty request && requestMethod request == methodPatch = do
552 | pathIsEmpty request && requestMethod request == methodPatch = do
553 e <- runEitherT action
553 e <- runEitherT action