summaryrefslogtreecommitdiff
path: root/compiler/deSugar/DsMonad.hs
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 /compiler/deSugar/DsMonad.hs
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 'compiler/deSugar/DsMonad.hs')
-rw-r--r--compiler/deSugar/DsMonad.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/deSugar/DsMonad.hs b/compiler/deSugar/DsMonad.hs
index ee5c6e9569..ad6a6b1d7b 100644
--- a/compiler/deSugar/DsMonad.hs
+++ b/compiler/deSugar/DsMonad.hs
@@ -258,7 +258,7 @@ loadModule doc mod
Succeeded iface -> return $ mkGlobalRdrEnv . gresFromAvails prov . mi_exports $ iface
} }
where
- prov = Imported [ImpSpec { is_decl = imp_spec, is_item = ImpAll }]
+ prov = Just (ImpSpec { is_decl = imp_spec, is_item = ImpAll })
imp_spec = ImpDeclSpec { is_mod = name, is_qual = True,
is_dloc = wiredInSrcSpan, is_as = name }
name = moduleName mod