[commit: testsuite] master: Update output: New error messages as per #8576 (b3b88db)

git at git.haskell.org git at git.haskell.org
Tue Dec 3 13:28:14 UTC 2013


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b3b88db924f39d83586f41cf35608bc4809b2a9a/testsuite

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

commit b3b88db924f39d83586f41cf35608bc4809b2a9a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Dec 3 10:42:19 2013 +0000

    Update output: New error messages as per #8576


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

b3b88db924f39d83586f41cf35608bc4809b2a9a
 tests/deriving/should_fail/T2851.stderr            |    2 +-
 tests/deriving/should_fail/drvfail-functor2.stderr |    2 +-
 tests/deriving/should_fail/drvfail001.stderr       |    2 +-
 tests/deriving/should_fail/drvfail002.stderr       |    2 +-
 tests/deriving/should_fail/drvfail003.stderr       |    2 +-
 tests/deriving/should_fail/drvfail007.stderr       |    2 +-
 tests/deriving/should_fail/drvfail013.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail046.stderr       |    4 ++--
 tests/typecheck/should_fail/tcfail118.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail169.stderr       |    2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/deriving/should_fail/T2851.stderr b/tests/deriving/should_fail/T2851.stderr
index 70802ab..c7a3bf5 100644
--- a/tests/deriving/should_fail/T2851.stderr
+++ b/tests/deriving/should_fail/T2851.stderr
@@ -1,7 +1,7 @@
 
 T2851.hs:9:15:
     No instance for (Show (F a))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛D’ (type ‛F a’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/deriving/should_fail/drvfail-functor2.stderr b/tests/deriving/should_fail/drvfail-functor2.stderr
index 8691b38..322125c 100644
--- a/tests/deriving/should_fail/drvfail-functor2.stderr
+++ b/tests/deriving/should_fail/drvfail-functor2.stderr
@@ -24,7 +24,7 @@ drvfail-functor2.hs:20:14:
 
 drvfail-functor2.hs:26:14:
     No instance for (Functor NoFunctor)
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛UseNoFunctor’ (type ‛NoFunctor a’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/deriving/should_fail/drvfail001.stderr b/tests/deriving/should_fail/drvfail001.stderr
index 8c0be37..3f3d4ec 100644
--- a/tests/deriving/should_fail/drvfail001.stderr
+++ b/tests/deriving/should_fail/drvfail001.stderr
@@ -1,7 +1,7 @@
 
 drvfail001.hs:16:33:
     No instance for (Show (f (f a)))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛ZeroS’ (type ‛f (f a)’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/deriving/should_fail/drvfail002.stderr b/tests/deriving/should_fail/drvfail002.stderr
index 20d54c6..8064cb6 100644
--- a/tests/deriving/should_fail/drvfail002.stderr
+++ b/tests/deriving/should_fail/drvfail002.stderr
@@ -1,7 +1,7 @@
 
 drvfail002.hs:19:23:
     No instance for (X T c)
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛S’ (type ‛T’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/deriving/should_fail/drvfail003.stderr b/tests/deriving/should_fail/drvfail003.stderr
index f329420..a2493f3 100644
--- a/tests/deriving/should_fail/drvfail003.stderr
+++ b/tests/deriving/should_fail/drvfail003.stderr
@@ -1,7 +1,7 @@
 
 drvfail003.hs:16:56:
     No instance for (Show (v (v a)))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛End’ (type ‛v (v a)’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/deriving/should_fail/drvfail007.stderr b/tests/deriving/should_fail/drvfail007.stderr
index d47c14e..c9d998e 100644
--- a/tests/deriving/should_fail/drvfail007.stderr
+++ b/tests/deriving/should_fail/drvfail007.stderr
@@ -1,7 +1,7 @@
 
 drvfail007.hs:4:38:
     No instance for (Eq (Int -> Int))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛Foo’ (type ‛Int -> Int’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/deriving/should_fail/drvfail013.stderr b/tests/deriving/should_fail/drvfail013.stderr
index 29d8ba6..4b2350f 100644
--- a/tests/deriving/should_fail/drvfail013.stderr
+++ b/tests/deriving/should_fail/drvfail013.stderr
@@ -9,7 +9,7 @@ drvfail013.hs:4:70:
 
 drvfail013.hs:6:70:
     No instance for (Eq (m (Maybe a)))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛MaybeT'’ (type ‛m (Maybe a)’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/typecheck/should_fail/tcfail046.stderr b/tests/typecheck/should_fail/tcfail046.stderr
index e3a8f16..b029915 100644
--- a/tests/typecheck/should_fail/tcfail046.stderr
+++ b/tests/typecheck/should_fail/tcfail046.stderr
@@ -1,7 +1,7 @@
 
 tcfail046.hs:10:50:
     No instance for (Eq (Process a))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛Do’ (type ‛Process a’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
@@ -9,7 +9,7 @@ tcfail046.hs:10:50:
 
 tcfail046.hs:22:25:
     No instance for (Eq (Process a))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛Create’ (type ‛Process a’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/tests/typecheck/should_fail/tcfail118.stderr b/tests/typecheck/should_fail/tcfail118.stderr
index ec21d1f..01f6654 100644
--- a/tests/typecheck/should_fail/tcfail118.stderr
+++ b/tests/typecheck/should_fail/tcfail118.stderr
@@ -1,7 +1,7 @@
 
 tcfail118.hs:10:29:
     Overlapping instances for Eq Foo
-      arising from the 'deriving' clause of a data type declaration
+      arising from the first field of ‛Bar’ (type ‛Foo’)
     Matching instances:
       instance Eq Foo -- Defined at tcfail118.hs:11:25
       instance Eq Foo -- Defined at tcfail118.hs:13:10
diff --git a/tests/typecheck/should_fail/tcfail169.stderr b/tests/typecheck/should_fail/tcfail169.stderr
index 1e0262d..e1ac2db 100644
--- a/tests/typecheck/should_fail/tcfail169.stderr
+++ b/tests/typecheck/should_fail/tcfail169.stderr
@@ -1,7 +1,7 @@
 
 tcfail169.hs:7:51:
     No instance for (Show (Succ a))
-      arising from the 'deriving' clause of a data type declaration
+      arising from the second field of ‛Cons’ (type ‛Seq (Succ a)’)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself



More information about the ghc-commits mailing list