haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for GHC 7.8

Browse Source
This commit is contained in:
Michael Snoyman 2016-12-07 08:54:53 -05:00
parent ae7dfd2408
commit 03c1ee4807
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-test/ChangeLog.md
View File

@ -1,3 +1,7 @@
## 1.5.4.1
* Compilation fix for GHC 7.8
## 1.5.4 ## 1.5.4
* yesod-test: add getLocation test helper. [#1314](https://github.com/yesodweb/yesod/pull/1314) * yesod-test: add getLocation test helper. [#1314](https://github.com/yesodweb/yesod/pull/1314)

3
yesod-test/Yesod/Test.hs
View File

@ -146,6 +146,7 @@ import qualified Blaze.ByteString.Builder as Builder
import Data.Time.Clock (getCurrentTime) import Data.Time.Clock (getCurrentTime)
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Text.Show.Pretty (ppShow) import Text.Show.Pretty (ppShow)
import Data.Monoid (mempty)
-- | The state used in a single test case defined using 'yit' -- | The state used in a single test case defined using 'yit'
-- --
@ -772,7 +773,7 @@ getLocation = do
where decodePath b = let (x, y) = BS8.break (=='?') b where decodePath b = let (x, y) = BS8.break (=='?') b
in (H.decodePathSegments x, unJust <$> H.parseQueryText y) in (H.decodePathSegments x, unJust <$> H.parseQueryText y)
unJust (a, Just b) = (a, b) unJust (a, Just b) = (a, b)
unJust (a, Nothing) = (a, mempty) unJust (a, Nothing) = (a, Data.Monoid.mempty)
-- | Sets the HTTP method used by the request. -- | Sets the HTTP method used by the request.
-- --

2
yesod-test/yesod-test.cabal
View File

@ -1,5 +1,5 @@
name: yesod-test name: yesod-test
version: 1.5.4 version: 1.5.4.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Nubis <nubis@woobiz.com.ar> author: Nubis <nubis@woobiz.com.ar>