Make doctests accept GHC-8.0 formatted type errors

jml · May 10, 2016 · fd19694 · fd19694
1 parent 7ef2715
commit fd19694
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
@@ -122,7 +122,7 @@ test-suite spec
     , servant
     , servant-server
     , string-conversions
-    , should-not-typecheck == 2.*
+    , should-not-typecheck == 2.1.*
     , temporary
     , text
     , transformers

diff --git a/servant-server/src/Servant/Server/Internal/Context.hs b/servant-server/src/Servant/Server/Internal/Context.hs
@@ -59,7 +59,7 @@ instance (Eq a, Eq (Context as)) => Eq (Context (a ': as)) where
 --
 -- >>> getContextEntry (True :. False :. EmptyContext) :: String
 -- ...
---     No instance for (HasContextEntry '[] [Char])
+-- ...No instance for (HasContextEntry '[] [Char])
 -- ...
 class HasContextEntry (context :: [*]) (val :: *) where
     getContextEntry :: Context context -> val

diff --git a/servant/src/Servant/Utils/Links.hs b/servant/src/Servant/Utils/Links.hs
@@ -72,14 +72,8 @@
 -- >>> let bad_link = Proxy :: Proxy ("hello" :> Delete '[JSON] ())
 -- >>> safeLink api bad_link
 -- ...
---     Could not deduce (Or
---                         (IsElem' (Verb 'DELETE 200 '[JSON] ()) (Verb 'GET 200 '[JSON] Int))
---                         (IsElem'
---                            ("hello" :> Delete '[JSON] ())
---                            ("bye" :> (QueryParam "name" String :> Delete '[JSON] ()))))
---       arising from a use of ‘safeLink’
---     In the expression: safeLink api bad_link
---     In an equation for ‘it’: it = safeLink api bad_link
+-- ...Could not deduce...
+-- ...
 --
 --  This error is essentially saying that the type family couldn't find
 --  bad_link under api after trying the open (but empty) type family

diff --git a/servant/test/Servant/Utils/LinksSpec.hs b/servant/test/Servant/Utils/LinksSpec.hs
@@ -67,27 +67,27 @@ spec = describe "Servant.Utils.Links" $ do
 --
 -- >>> apiLink (Proxy :: Proxy WrongPath)
 -- ...
---     Could not deduce ...
+-- ...Could not deduce...
 -- ...
 --
 -- >>> apiLink (Proxy :: Proxy WrongReturnType)
 -- ...
---     Could not deduce ...
+-- ...Could not deduce...
 -- ...
 --
 -- >>> apiLink (Proxy :: Proxy WrongContentType)
 -- ...
---     Could not deduce ...
+-- ...Could not deduce...
 -- ...
 --
 -- >>> apiLink (Proxy :: Proxy WrongMethod)
 -- ...
---     Could not deduce ...
+-- ...Could not deduce...
 -- ...
 --
 -- >>> apiLink (Proxy :: Proxy NotALink)
 -- ...
---     Could not deduce ...
+-- ...Could not deduce...
 -- ...
 --
 -- sanity check