[commit: ghc] master: Update Safe Haskell typeable test outputs. (105602f)

git at git.haskell.org git at git.haskell.org
Sat Aug 2 02:05:32 UTC 2014


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/105602f47f84ad17a87c68491effd0ba59ea1df6/ghc

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

commit 105602f47f84ad17a87c68491effd0ba59ea1df6
Author: David Terei <code at davidterei.com>
Date:   Thu Jul 31 10:12:35 2014 -0700

    Update Safe Haskell typeable test outputs.


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

105602f47f84ad17a87c68491effd0ba59ea1df6
 testsuite/tests/safeHaskell/ghci/p15.stderr                | 4 +++-
 testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr | 8 ++++++--
 testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr  | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/testsuite/tests/safeHaskell/ghci/p15.stderr b/testsuite/tests/safeHaskell/ghci/p15.stderr
index 19684b3..55b5d4b 100644
--- a/testsuite/tests/safeHaskell/ghci/p15.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p15.stderr
@@ -8,7 +8,9 @@ Top level: Warning:
     Deprecated: "Use Data.Typeable.Internal instead"
 
 <interactive>:14:10:
-    Can't create hand written instances of Typeable in Safe Haskell! Can only derive them
+    Typeable instances can only be derived in Safe Haskell.
+    Replace the following instance:
+      instance [safe] Typeable G
 
 <interactive>:22:22:
     No instance for (Typeable G) arising from a use of ‘cast’
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr
index af8dca3..c0f94d5 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang14.stderr
@@ -2,7 +2,11 @@
 [2 of 2] Compiling Main             ( SafeLang14.hs, SafeLang14.o )
 
 SafeLang14.hs:14:10:
-    Can't create hand written instances of Typeable in Safe Haskell! Can only derive them
+    Typeable instances can only be derived in Safe Haskell.
+    Replace the following instance:
+      instance [safe] Typeable G
 
 SafeLang14.hs:17:10:
-    Can't create hand written instances of Typeable in Safe Haskell! Can only derive them
+    Typeable instances can only be derived in Safe Haskell.
+    Replace the following instance:
+      instance [safe] Typeable P
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr
index 03b8028..d32e33f 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr
@@ -2,4 +2,6 @@
 [2 of 2] Compiling Main             ( BadImport03.hs, BadImport03.o )
 
 BadImport03.hs:16:10:
-    Can't create hand written instances of Typeable in Safe Haskell! Can only derive them
+    Typeable instances can only be derived in Safe Haskell.
+    Replace the following instance:
+      instance [safe] Typeable NInt



More information about the ghc-commits mailing list