b8510ed · servant · git.iko.soy

servant-server/test/Servant/Server/Internal/ContextSpec.hs+1−1

@@ -37,7 +37,7 @@ spec = do

37

38 it "works with operators" $ do

39 let cxt = ((1 :: Integer) :. 'a' :. EmptyContext) :<|> ('b' :. True :. EmptyContext)

40− show cxt `shouldBe` "(1 :. 'a' :. EmptyContext) :<|> ('b' :. True :. EmptyContext)"

40+ show cxt `shouldBe` "1 :. 'a' :. EmptyContext :<|> 'b' :. True :. EmptyContext"

41

42 describe "descendIntoNamedContext" $ do

43 let cxt :: Context [Char, NamedContext "sub" '[Char]]

servant/CHANGELOG.md+6

@@ -1,3 +1,9 @@

1+Unreleased changes

2+---

3+

4+- Lower `:>` and `:<|>` infix precedence to 4 and 3 respectively

5+ ([#761](https://github.com/haskell-servant/servant/issues/761))

6+

10.11

70.11

2----

8----

3

9

servant/src/Servant/API/Alternative.hs+1−1

@@ -22,7 +22,7 @@ import Prelude.Compat

22-- :}

23data a :<|> b = a :<|> b

24 deriving (Typeable, Eq, Show, Functor, Traversable, Foldable, Bounded)

25−infixr 8 :<|>

25+infixr 3 :<|>

26

27instance (Semigroup a, Semigroup b) => Semigroup (a :<|> b) where

28 (a :<|> b) <> (a' :<|> b') = (a <> a') :<|> (b <> b')

servant/src/Servant/API/Sub.hs+1−1

@@ -16,7 +16,7 @@ import Data.Typeable (Typeable)

16-- >>> type MyApi = "hello" :> "world" :> Get '[JSON] World

17data (path :: k) :> a

18 deriving (Typeable)

19−infixr 9 :>

19+infixr 4 :>

20

21-- $setup

22-- >>> import Servant.API