[commit: ghc] master: Update some tests for recent Safe Haskell change. (4432863)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/44328639fb9044049be27fdb02a79f0e381c592c/ghc

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

commit 44328639fb9044049be27fdb02a79f0e381c592c
Author: David Terei <code at davidterei.com>
Date:   Tue May 12 14:15:20 2015 -0700

    Update some tests for recent Safe Haskell change.


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

44328639fb9044049be27fdb02a79f0e381c592c
 testsuite/tests/ghci/scripts/T5820.stdout             | 4 ++--
 testsuite/tests/ghci/scripts/ghci019.stdout           | 2 +-
 testsuite/tests/ghci/scripts/ghci044.stderr           | 6 +++---
 testsuite/tests/typecheck/should_compile/T4912.stderr | 8 ++++----
 testsuite/tests/warnings/should_compile/T9178.stderr  | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testsuite/tests/ghci/scripts/T5820.stdout b/testsuite/tests/ghci/scripts/T5820.stdout
index e0a97a0..a8dddd3 100644
--- a/testsuite/tests/ghci/scripts/T5820.stdout
+++ b/testsuite/tests/ghci/scripts/T5820.stdout
@@ -1,4 +1,4 @@
 data Foo = Foo 	-- Defined at T5820.hs:2:1
-instance Eq Foo -- Defined at T5820.hs:3:10
+instance [safe] Eq Foo -- Defined at T5820.hs:3:10
 data Foo = Foo 	-- Defined at T5820.hs:2:1
-instance Eq Foo -- Defined at T5820.hs:3:10
+instance [safe] Eq Foo -- Defined at T5820.hs:3:10
diff --git a/testsuite/tests/ghci/scripts/ghci019.stdout b/testsuite/tests/ghci/scripts/ghci019.stdout
index 85b5e02..5c8b242 100644
--- a/testsuite/tests/ghci/scripts/ghci019.stdout
+++ b/testsuite/tests/ghci/scripts/ghci019.stdout
@@ -1,2 +1,2 @@
 data Foo = Foo 	-- Defined at ghci019.hs:8:1
-instance Eq Foo -- Defined at ghci019.hs:9:10
+instance [safe] Eq Foo -- Defined at ghci019.hs:9:10
diff --git a/testsuite/tests/ghci/scripts/ghci044.stderr b/testsuite/tests/ghci/scripts/ghci044.stderr
index 625696a..b49978d 100644
--- a/testsuite/tests/ghci/scripts/ghci044.stderr
+++ b/testsuite/tests/ghci/scripts/ghci044.stderr
@@ -1,8 +1,8 @@
 
-<interactive>:10:1:
+<interactive>:10:1: error:
     Overlapping instances for C [Int] arising from a use of ‘f’
     Matching instances:
-      instance C [Int] -- Defined at <interactive>:7:10
-      instance C a => C [a] -- Defined at <interactive>:9:10
+      instance [safe] C [Int] -- Defined at <interactive>:7:10
+      instance [safe] C a => C [a] -- Defined at <interactive>:9:10
     In the expression: f [4 :: Int]
     In an equation for ‘it’: it = f [4 :: Int]
diff --git a/testsuite/tests/typecheck/should_compile/T4912.stderr b/testsuite/tests/typecheck/should_compile/T4912.stderr
index 0e0920f..855d365 100644
--- a/testsuite/tests/typecheck/should_compile/T4912.stderr
+++ b/testsuite/tests/typecheck/should_compile/T4912.stderr
@@ -1,12 +1,12 @@
 
-T4912.hs:10:10: Warning:
-    Orphan instance: instance Foo TheirData
+T4912.hs:10:10: warning:
+    Orphan instance: instance [safe] Foo TheirData
     To avoid this
         move the instance declaration to the module of the class or of the type, or
         wrap the type with a newtype and declare the instance on the new type.
 
-T4912.hs:13:10: Warning:
-    Orphan instance: instance Bar OurData
+T4912.hs:13:10: warning:
+    Orphan instance: instance [safe] Bar OurData
     To avoid this
         move the instance declaration to the module of the class or of the type, or
         wrap the type with a newtype and declare the instance on the new type.
diff --git a/testsuite/tests/warnings/should_compile/T9178.stderr b/testsuite/tests/warnings/should_compile/T9178.stderr
index 6f4b6c0..c1e99bc 100644
--- a/testsuite/tests/warnings/should_compile/T9178.stderr
+++ b/testsuite/tests/warnings/should_compile/T9178.stderr
@@ -1,8 +1,8 @@
 [1 of 2] Compiling T9178DataType    ( T9178DataType.hs, T9178DataType.o )
 [2 of 2] Compiling T9178            ( T9178.hs, T9178.o )
 
-T9178.hs:8:10: Warning:
-    Orphan instance: instance Show T9178_Type
+T9178.hs:8:10: warning:
+    Orphan instance: instance [safe] Show T9178_Type
     To avoid this
         move the instance declaration to the module of the class or of the type, or
         wrap the type with a newtype and declare the instance on the new type.