summaryrefslogtreecommitdiff
path: root/compiler/GHC/Tc/Module.hs
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-09-24 15:56:21 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-09-29 09:44:40 -0400
commitf66eaefd5d4a3e0c0822dd3678e5e55a7d972a0d (patch)
tree672eb26f7d2aae5f06486521ae9afdc3f2d9d7de /compiler/GHC/Tc/Module.hs
parent2e68d4fa8c2514009db368fbbce213e36bdbcda2 (diff)
downloadhaskell-f66eaefd5d4a3e0c0822dd3678e5e55a7d972a0d.tar.gz
compiler: occEnvElts -> nonDetOccEnvElts
Diffstat (limited to 'compiler/GHC/Tc/Module.hs')
-rw-r--r--compiler/GHC/Tc/Module.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/GHC/Tc/Module.hs b/compiler/GHC/Tc/Module.hs
index c649edd301..578adf730a 100644
--- a/compiler/GHC/Tc/Module.hs
+++ b/compiler/GHC/Tc/Module.hs
@@ -1583,7 +1583,7 @@ tcPreludeClashWarn warnFlag name = do
-- Continue only the name is imported from Prelude
; when (importedViaPrelude name rnImports) $ do
-- Handle 2.-4.
- { rdrElts <- fmap (concat . occEnvElts . tcg_rdr_env) getGblEnv
+ { rdrElts <- fmap (concat . nonDetOccEnvElts . tcg_rdr_env) getGblEnv
; let clashes :: GlobalRdrElt -> Bool
clashes x = isLocalDef && nameClashes && isNotInProperModule
@@ -2038,7 +2038,7 @@ runTcInteractive hsc_env thing_inside
vcat [ text "ic_tythings:" <+> vcat (map ppr (ic_tythings icxt))
, text "ic_insts:" <+> vcat (map (pprBndr LetBind . instanceDFunId) ic_insts)
, text "ic_rn_gbl_env (LocalDef)" <+>
- vcat (map ppr [ local_gres | gres <- occEnvElts (ic_rn_gbl_env icxt)
+ vcat (map ppr [ local_gres | gres <- nonDetOccEnvElts (ic_rn_gbl_env icxt)
, let local_gres = filter isLocalGRE gres
, not (null local_gres) ]) ]