460a0c9 · typeable/servant

git.iko.soy/typeable/servant

more purging

commit460a0c90b49294386b9b7ea6e7c80bff6b78e3de authorDenis Redozubov <denis.redozubov@gmail.com> dateSat 12 Mar 2016, 12:45 (11 years ago) parent5427387

3 files changed+7−7

compare with master

unifiedsplit

servant-js/servant-js.cabal+2 servant-js/test/Servant/JSSpec.hs+5−6 servant/src/Servant/Utils/Links.hs−1

servant-js/servant-js.cabal+2

@@ -42,6 +42,7 @@ library

4242 Servant.JS.JQuery

4343 Servant.JS.Vanilla

4444 build-depends: base >= 4.5 && <5

45+ , base-compat >= 0.9

4546 , charset >= 0.3

4647 , lens >= 4

4748 , servant-foreign == 0.5.*

@@ -83,6 +84,7 @@ test-suite spec

8384 Servant.JSSpec

8485 Servant.JSSpec.CustomHeaders

8586 build-depends: base

87+ , base-compat

8688 , hspec >= 2.1.8

8789 , hspec-expectations

8890 , language-ecmascript >= 0.16

servant-js/test/Servant/JSSpec.hs+5−6

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

21{-# LANGUAGE DataKinds #-}

32{-# LANGUAGE FlexibleInstances #-}

43{-# LANGUAGE QuasiQuotes #-}

@@ -7,18 +6,18 @@

76{-# LANGUAGE TypeOperators #-}

87{-# LANGUAGE OverloadedStrings #-}

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

1010module Servant.JSSpec where

1111

1212import Data.Either (isRight)

13−#if !MIN_VERSION_base(4,8,0)

14−import Data.Monoid ((<>),mconcat)

15−#else

16−import Data.Monoid ((<>))

17−#endif

13+import Data.Monoid ()

14+import Data.Monoid.Compat ((<>))

1815import Data.Proxy

1916import Data.Text (Text)

2017import qualified Data.Text as T

2118import Language.ECMAScript3.Parser (program, parse)

19+import Prelude ()

20+import Prelude.Compat

2221import Test.Hspec hiding (shouldContain, shouldNotContain)

2322

2423import Servant.API.Internal.Test.ComprehensiveAPI

servant/src/Servant/Utils/Links.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

21{-# LANGUAGE ConstraintKinds #-}

32{-# LANGUAGE DataKinds #-}

43{-# LANGUAGE FlexibleInstances #-}