[commit: ghc] wip/ttypeable: Accept easy test output (c92c1dc)

git at git.haskell.org git at git.haskell.org
Wed Apr 13 17:55:46 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/ttypeable
Link       : http://ghc.haskell.org/trac/ghc/changeset/c92c1dc498d734844b2124dc957365ea53cd8b9f/ghc

>---------------------------------------------------------------

commit c92c1dc498d734844b2124dc957365ea53cd8b9f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Mar 16 22:58:53 2016 +0100

    Accept easy test output


>---------------------------------------------------------------

c92c1dc498d734844b2124dc957365ea53cd8b9f
 testsuite/tests/ghci.debugger/scripts/print019.stderr               | 6 +++---
 testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr
index cc62fa1..c266bc8 100644
--- a/testsuite/tests/ghci.debugger/scripts/print019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr
@@ -5,10 +5,10 @@
       Use :print or :force to determine these types
       Relevant bindings include it :: a1 (bound at <interactive>:10:1)
       These potential instances exist:
-        instance Show TypeRep -- Defined in ‘Data.Typeable.Internal’
         instance Show Ordering -- Defined in ‘GHC.Show’
         instance Show TyCon -- Defined in ‘GHC.Show’
-        ...plus 30 others
-        ...plus 10 instances involving out-of-scope types
+        instance Show Integer -- Defined in ‘GHC.Show’
+        ...plus 29 others
+        ...plus 12 instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
     • In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
index e6e637c..b48d63f 100644
--- a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
+++ b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
@@ -1,13 +1,13 @@
 
 TcStaticPointersFail02.hs:9:6: error:
-    • No instance for (Data.Typeable.Internal.Typeable b)
+    • No instance for (base-4.9.0.0:Data.Typeable.Internal.Typeable b)
         arising from a static form
     • In the expression: static (undefined :: (forall a. a -> a) -> b)
       In an equation for ‘f1’:
           f1 = static (undefined :: (forall a. a -> a) -> b)
 
 TcStaticPointersFail02.hs:12:6: error:
-    • No instance for (Data.Typeable.Internal.Typeable
+    • No instance for (base-4.9.0.0:Data.Typeable.Internal.Typeable
                          (Monad m => a -> m a))
         arising from a static form
         (maybe you haven't applied a function to enough arguments?)



More information about the ghc-commits mailing list