summaryrefslogtreecommitdiff
path: root/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2014-07-31 15:49:14 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2014-07-31 15:49:45 +0100
commit1ae5fa451f4f554e0d652d55f9312a585188ce13 (patch)
tree1d0ef82924eedf6803b48b8d0ba7748f9622b227 /testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
parentbfaa17998ed0cb8b22132d8e824b274ac5f038cc (diff)
downloadhaskell-1ae5fa451f4f554e0d652d55f9312a585188ce13.tar.gz
Complete work on new OVERLAPPABLE/OVERLAPPING pragmas (Trac #9242)
* Deprecate -XOverlappingInstances * Update test suite. Several tests even had entirely unnecessary uses of -XOverlappingInstances * Update user manual with a careful description of the instance resolution story * Fix an outright bug in the handling of duplidate instances in GHCi, which are meant to silently overwrite the earlier duplicate. The logic was right for family instances but was both more complicated, and plain wrong, for class instances. (If you are interested, the bug was that we were eliminating the duplicate from the InstEnv, but not from the [ClsInst] held in tcg_insts.) Test is ghci044a.
Diffstat (limited to 'testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr')
-rw-r--r--testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
index 83c79da75f..d0c5c68d6a 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
@@ -6,8 +6,8 @@ SafeLang10.hs:8:13:
Unsafe overlapping instances for Pos [Int]
arising from a use of ‘res’
The matching instance is:
- instance [overlap ok] [safe] Pos [Int]
- -- Defined at SafeLang10_B.hs:14:10
+ instance [overlapping] [safe] Pos [Int]
+ -- Defined at SafeLang10_B.hs:13:30
It is compiled in a Safe module and as such can only
overlap instances from the same module, however it
overlaps the following instances from different modules: