cd7906d · typeable/servant

servant-client/CHANGELOG.md+1

compare with master

unifiedsplit

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

3

4* Support for the `HttpVersion`, `IsSecure`, `RemoteHost` and `Vault` combinators

5* Added support for `path` on `BaseUrl`.

6+* `client` now takes an explicit `Manager` argument.

6

7

70.4.1

80.4.1

8-----

9-----

servant/CHANGELOG.md+1

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

3

4* Add `HttpVersion`, `IsSecure`, `RemoteHost` and `Vault` combinators

5* Fix safeLink, so Header is not in fact required.

6+* Added more instances for (:<|>)

6

7

70.4.2

80.4.2

8-----

9-----

servant/src/Servant/API/Alternative.hs+7−2

@@ -1,15 +1,20 @@

1{-# LANGUAGE CPP #-}

2{-# LANGUAGE DeriveDataTypeable #-}

3{-# LANGUAGE DeriveFunctor #-}

4+#if !MIN_VERSION_base(4,8,0)

5+{-# LANGUAGE DeriveFoldable #-}

6+#endif

4{-# LANGUAGE DeriveTraversable #-}

7{-# LANGUAGE DeriveTraversable #-}

5{-# LANGUAGE TypeOperators #-}

8{-# LANGUAGE TypeOperators #-}

6{-# OPTIONS_HADDOCK not-home #-}

9{-# OPTIONS_HADDOCK not-home #-}

7module Servant.API.Alternative ((:<|>)(..)) where

10module Servant.API.Alternative ((:<|>)(..)) where

8

11

9#if !MIN_VERSION_base(4,8,0)

12#if !MIN_VERSION_base(4,8,0)

10−import Data.Monoid (Monoid (..))

13+import Data.Monoid (Monoid (..))

14+import Data.Traversable (Traversable)

15+import Data.Foldable (Foldable)

11#endif

16#endif

12−import Data.Typeable (Typeable)

17+import Data.Typeable (Typeable)

13-- | Union of two APIs, first takes precedence in case of overlap.

18-- | Union of two APIs, first takes precedence in case of overlap.

14--

19--

15-- Example:

20-- Example: