48c2cc6 · servant · git.iko.soy

servant-docs/example/greet.hs+1

compare with master

unifiedsplit

@@ -5,6 +5,7 @@

5{-# LANGUAGE OverloadedStrings #-}

6{-# LANGUAGE TypeOperators #-}

7{-# OPTIONS_GHC -fno-warn-orphans #-}

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

8import Control.Lens

9import Control.Lens

9import Data.Aeson

10import Data.Aeson

10import Data.Proxy

11import Data.Proxy

servant-docs/test/Servant/DocsSpec.hs+1

@@ -5,6 +5,7 @@

5{-# LANGUAGE TypeOperators #-}

6{-# LANGUAGE TypeSynonymInstances #-}

7{-# OPTIONS_GHC -fno-warn-orphans #-}

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

8module Servant.DocsSpec where

9module Servant.DocsSpec where

9

10

10import Control.Lens

11import Control.Lens

servant-examples/auth-combinator/auth-combinator.hs+2

@@ -5,6 +5,8 @@

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE OverloadedStrings #-}

7{-# LANGUAGE ScopedTypeVariables #-}

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

9+{-# OPTIONS_GHC -fno-warn-unused-binds #-}

8import Data.Aeson

10import Data.Aeson

9import Data.ByteString (ByteString)

11import Data.ByteString (ByteString)

10import Data.Text (Text)

12import Data.Text (Text)

servant-examples/hackage/hackage.hs+2

@@ -2,6 +2,8 @@

2{-# LANGUAGE DeriveGeneric #-}

3{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE OverloadedStrings #-}

5+{-# OPTIONS_GHC -fno-warn-unused-binds #-}

6+{-# OPTIONS_GHC -fno-warn-unused-imports #-}

5import Control.Applicative

7import Control.Applicative

6import Control.Monad

8import Control.Monad

7import Control.Monad.IO.Class

9import Control.Monad.IO.Class

servant-examples/servant-examples.cabal+1

@@ -45,6 +45,7 @@ executable tutorial

45

46executable t8-main

47 main-is: t8-main.hs

48+ other-modules: T3, T8

48 hs-source-dirs: tutorial

49 hs-source-dirs: tutorial

49 default-language: Haskell2010

50 default-language: Haskell2010

50 build-depends:

51 build-depends:

servant-examples/tutorial/T1.hs+1

@@ -2,6 +2,7 @@

2{-# LANGUAGE TypeFamilies #-}

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE TypeOperators #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

5module T1 where

6module T1 where

6

7

7import Data.Aeson

8import Data.Aeson

servant-examples/tutorial/T10.hs+1

@@ -4,6 +4,7 @@

4{-# LANGUAGE FlexibleInstances #-}

5{-# LANGUAGE OverloadedStrings #-}

6{-# LANGUAGE MultiParamTypeClasses #-}

7+{-# OPTIONS_GHC -fno-warn-orphans #-}

7module T10 where

8module T10 where

8

9

9import Data.ByteString.Lazy (ByteString)

10import Data.ByteString.Lazy (ByteString)

servant-examples/tutorial/T2.hs+1

@@ -2,6 +2,7 @@

2{-# LANGUAGE TypeFamilies #-}

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE TypeOperators #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

5module T2 where

6module T2 where

6

7

7import Data.Aeson

8import Data.Aeson

servant-examples/tutorial/T3.hs+2−1

@@ -2,6 +2,7 @@

2{-# LANGUAGE TypeFamilies #-}

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE TypeOperators #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

5module T3 where

6module T3 where

6

7

7import Control.Monad.Trans.Either

8import Control.Monad.Trans.Either

@@ -70,7 +71,7 @@ server = position

70 :<|> marketing

71 :<|> marketing

71

72

72 where position :: Int -> Int -> EitherT ServantErr IO Position

73 where position :: Int -> Int -> EitherT ServantErr IO Position

73− position x y = return (Position x y)

74+ position a b = return (Position a b)

74

75

75 hello :: Maybe String -> EitherT ServantErr IO HelloMessage

76 hello :: Maybe String -> EitherT ServantErr IO HelloMessage

76 hello mname = return . HelloMessage $ case mname of

77 hello mname = return . HelloMessage $ case mname of

servant-examples/tutorial/T4.hs+4−2

@@ -4,6 +4,8 @@

4{-# LANGUAGE TypeOperators #-}

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE OverloadedStrings #-}

7+{-# OPTIONS_GHC -fno-warn-unused-imports #-}

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

7module T4 where

9module T4 where

8

10

9import Data.Aeson

11import Data.Aeson

@@ -35,13 +37,13 @@ instance ToHtml Person where

35

37

36-- HTML serialization of a list of persons

38-- HTML serialization of a list of persons

37instance ToHtml [Person] where

39instance ToHtml [Person] where

38− toHtml persons = table_ $ do

40+ toHtml ps = table_ $ do

39 tr_ $ do

41 tr_ $ do

40 th_ "first name"

42 th_ "first name"

41 th_ "last name"

43 th_ "last name"

42 th_ "age"

44 th_ "age"

43

45

44− foldMap toHtml persons

46+ foldMap toHtml ps

45

47

46 toHtmlRaw = toHtml

48 toHtmlRaw = toHtml

47

49

servant-examples/tutorial/T5.hs+1

@@ -3,6 +3,7 @@

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE TypeOperators #-}

5{-# LANGUAGE OverloadedStrings #-}

6+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

6module T5 where

7module T5 where

7

8

8import Control.Monad.IO.Class

9import Control.Monad.IO.Class

servant-examples/tutorial/T8.hs+2−1

@@ -1,10 +1,11 @@

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE TypeFamilies #-}

3{-# LANGUAGE TypeOperators #-}

4+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

4module T8 where

6module T8 where

5

7

6import Control.Monad.Trans.Either

8import Control.Monad.Trans.Either

7−import Data.Aeson

8import Servant

9import Servant

9import Servant.Client

10import Servant.Client

10

11

servant-examples/tutorial/T9.hs+2

@@ -3,6 +3,8 @@

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE TypeOperators #-}

5{-# LANGUAGE OverloadedStrings #-}

6+{-# OPTIONS_GHC -fno-warn-unused-imports #-}

7+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

6module T9 where

8module T9 where

7

9

8import Control.Applicative

10import Control.Applicative

servant-examples/wai-middleware/wai-middleware.hs+2

@@ -1,6 +1,8 @@

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DeriveGeneric #-}

3{-# LANGUAGE OverloadedStrings #-}

4+{-# OPTIONS_GHC -fno-warn-unused-binds #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

4import Data.Aeson

6import Data.Aeson

5import Data.Text

7import Data.Text

6import GHC.Generics

8import GHC.Generics

servant-mock/src/Servant/Mock.hs+2−1

@@ -5,6 +5,7 @@

5{-# LANGUAGE ScopedTypeVariables #-}

6{-# LANGUAGE TypeFamilies #-}

7{-# LANGUAGE TypeOperators #-}

8+{-# OPTIONS_GHC -fno-warn-orphans #-}

8-- |

9-- |

9-- Module : Servant.Mock

10-- Module : Servant.Mock

10-- Copyright : 2015 Alp Mestanogullari

11-- Copyright : 2015 Alp Mestanogullari

@@ -153,7 +154,7 @@ instance (Arbitrary a, AllCTRender ctypes a) => HasMock (Put ctypes a) where

153 mock _ = mockArbitrary

154 mock _ = mockArbitrary

154

155

155instance HasMock Raw where

156instance HasMock Raw where

156− mock _ = \req respond -> do

157+ mock _ = \_ respond -> do

157 bdy <- genBody

158 bdy <- genBody

158 respond $ responseLBS status200 [] bdy

159 respond $ responseLBS status200 [] bdy

159

160

servant-server/example/greet.hs+1

@@ -4,6 +4,7 @@

4{-# LANGUAGE DeriveGeneric #-}

5{-# LANGUAGE TypeOperators #-}

6{-# LANGUAGE OverloadedStrings #-}

7+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

7

8

8import Data.Aeson

9import Data.Aeson

9import Data.Monoid

10import Data.Monoid