21667cc · typeable/servant

src/Servant/API/ContentTypes.hs+1−2

compare with master

unifiedsplit

@@ -11,12 +11,11 @@

11{-# LANGUAGE UndecidableInstances #-}

12module Servant.API.ContentTypes where

13

14−import Data.Typeable

15−

16import Control.Monad (join)

14import Control.Monad (join)

17import qualified Data.ByteString as BS

15import qualified Data.ByteString as BS

18import Data.ByteString.Lazy (ByteString)

16import Data.ByteString.Lazy (ByteString)

19import Data.String.Conversions (cs)

17import Data.String.Conversions (cs)

18+import Data.Typeable

20import GHC.Exts (Constraint)

19import GHC.Exts (Constraint)

21import qualified Network.HTTP.Media as M

20import qualified Network.HTTP.Media as M

22

21

src/Servant/API/ContentTypes/HTML.hsdeleted−4

@@ -1,4 +0,0 @@

1−module Servant.API.ContentTypes.HTML where

2−

3−data HTML

4− deriving Typeable

src/Servant/Utils/Links.hs+3−3

@@ -20,7 +20,7 @@

20-- >>>

21-- >>>

22-- >>>

23−-- >>> type Hello = "hello" :> Get Int

23+-- >>> type Hello = "hello" :> Get '[JSON] Int

24-- >>> type Bye = "bye" :> QueryParam "name" String :> Delete

25-- >>> type API = Hello :<|> Bye

26-- >>> let api = Proxy :: Proxy API

@@ -40,7 +40,7 @@

40-- function that accepts that input and generates a link. This is best shown

41-- with an example. Here, a link is generated with no parameters:

42--

43−-- >>> let hello = Proxy :: Proxy ("hello" :> Get Int)

43+-- >>> let hello = Proxy :: Proxy ("hello" :> Get '[JSON] Int)

44-- >>> print (safeLink api hello :: URI)

45-- hello

46--

@@ -74,7 +74,7 @@

74-- <BLANKLINE>

75-- <interactive>:64:1:

76-- Could not deduce (Or

77−-- (IsElem' Delete (Get Int))

77+-- (IsElem' Delete (Get '[JSON] Int))

78-- (IsElem'

79-- ("hello" :> Delete)

80-- ("bye" :> (QueryParam "name" String :> Delete))))