summaryrefslogtreecommitdiff
path: root/testsuite/tests/rename
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2015-06-03 11:43:53 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2015-06-03 11:46:17 +0100
commit7ea156ae3e1c66e59935f0eb877ea1a3f3bfd5b9 (patch)
tree9fe22f362259b215ab39b527c97558a143118131 /testsuite/tests/rename
parent7b6800c5ab62cb10b3c1b7a85e40c77897cc366f (diff)
downloadhaskell-7ea156ae3e1c66e59935f0eb877ea1a3f3bfd5b9.tar.gz
Refactor RdrName.Provenance, to fix #7672
Trac #7672 has a data type T in module A that is in scope *both* locally-bound *and* imported (with a qualified) name. The Provenance of a GlobalRdrElt simply couldn't express that before. Now you can. In doing so, I flattened out Provenance into GlobalRdrElt, so quite a lot of modules are touched in a not-very-interesting way.
Diffstat (limited to 'testsuite/tests/rename')
-rw-r--r--testsuite/tests/rename/should_compile/T7672.hs4
-rw-r--r--testsuite/tests/rename/should_compile/all.T2
2 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/rename/should_compile/T7672.hs b/testsuite/tests/rename/should_compile/T7672.hs
index 405c853c62..95b2b455c8 100644
--- a/testsuite/tests/rename/should_compile/T7672.hs
+++ b/testsuite/tests/rename/should_compile/T7672.hs
@@ -1,3 +1,3 @@
module T7672 where
-import qualified T7672a
-data T = S B.T
+import qualified T7672a as XX
+data T = S XX.T
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index fc5d125daa..aa29c43f65 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -212,7 +212,7 @@ test('T7167', normal, compile, [''])
test('T7336', expect_broken(7336), compile, ['-Wall'])
test('T2435', normal, multimod_compile, ['T2435','-v0'])
-test('T7672', expect_broken(7672), multimod_compile, ['T7672',''])
+test('T7672', normal, multimod_compile, ['T7672','-v0'])
test('T7963',
[extra_clean(['T7963a.hi', 'T7963a.o',
'T7963.imports'])],