diff --git a/testsuite/tests/ghci/scripts/T5820.stdout b/testsuite/tests/ghci/scripts/T5820.stdout index e0a97a06d5f745f17475762afe9a31d63198a750..a8dddd386389d2ef7b55110bef27142c80f6f97b 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 85b5e02157ee5eef2f0cf7f513e1f977317f7e51..5c8b2423399767564090fc740949dbbb9fc58f14 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 +data Foo = Foo -- Defined at ghci019.hs:8:1 +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 625696a8bae7dce26ee58b899ad3b9add5944809..b49978dd396142885b51479d825577566667e5ca 100644 --- a/testsuite/tests/ghci/scripts/ghci044.stderr +++ b/testsuite/tests/ghci/scripts/ghci044.stderr @@ -1,8 +1,8 @@ -:10:1: +:10:1: error: Overlapping instances for C [Int] arising from a use of β€˜f’ Matching instances: - instance C [Int] -- Defined at :7:10 - instance C a => C [a] -- Defined at :9:10 + instance [safe] C [Int] -- Defined at :7:10 + instance [safe] C a => C [a] -- Defined at :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 0e0920f034b9225f7f49eb015d02ddddc48c23df..855d365db515f34dc89e633482916355e341c090 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 6f4b6c02958c12224e49da71384d59ceee612547..c1e99bc5164aaab18f9ecea8285f4927bd1eed72 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.