16cb266 · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Merge pull request #686 from Tarrasch/fixes-to-tutorial

16cb266Oleg Grenrus10 years ago

doc/tutorial/Client.lhs+4−3

compare with master

unifiedsplit

@@ -27,8 +27,8 @@ Also, we need examples for some domain specific data types:

28``` haskell

29data Position = Position

30− { x :: Int

30+ { xCoord :: Int

31− , y :: Int

31+ , yCoord :: Int

32 } deriving (Show, Generic)

34instance FromJSON Position

@@ -107,6 +107,7 @@ data BaseUrl = BaseUrl

107 { baseUrlScheme :: Scheme -- ^ URI scheme to use

108 , baseUrlHost :: String -- ^ host (eg "haskell.org")

109 , baseUrlPort :: Int -- ^ port (eg 80)

110+ , baseUrlPath :: String -- ^ path (eg "/a/b/c")

110 }

111 }

111```

112```

112

113

@@ -135,7 +136,7 @@ run = do

135Here's the output of the above code running against the appropriate server:

136Here's the output of the above code running against the appropriate server:

136

137

137``` bash

138``` bash

138−Position {x = 10, y = 10}

139+Position {xCoord = 10, yCoord = 10}

139HelloMessage {msg = "Hello, servant"}

140HelloMessage {msg = "Hello, servant"}

140Email {from = "great@company.com", to = "alp@foo.com", subject = "Hey Alp, we miss you!", body = "Hi Alp,\n\nSince you've recently turned 26, have you checked out our latest haskell, mathematics products? Give us a visit!"}

141Email {from = "great@company.com", to = "alp@foo.com", subject = "Hey Alp, we miss you!", body = "Hi Alp,\n\nSince you've recently turned 26, have you checked out our latest haskell, mathematics products? Give us a visit!"}

141```

142```