diff options
Diffstat (limited to 'compiler/GHC/Tc/Utils')
| -rw-r--r-- | compiler/GHC/Tc/Utils/Monad.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Utils/TcMType.hs | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/compiler/GHC/Tc/Utils/Monad.hs b/compiler/GHC/Tc/Utils/Monad.hs index afc7633ff2..ecd3ab3249 100644 --- a/compiler/GHC/Tc/Utils/Monad.hs +++ b/compiler/GHC/Tc/Utils/Monad.hs @@ -729,9 +729,9 @@ newSysLocalId fs w ty newSysLocalIds :: FastString -> [Scaled TcType] -> TcRnIf gbl lcl [TcId] newSysLocalIds fs tys - = do { us <- newUniqueSupply + = do { us <- getUniquesM ; let mkId' n (Scaled w t) = mkSysLocal fs n w t - ; return (zipWith mkId' (uniqsFromSupply us) tys) } + ; return (zipWith mkId' us tys) } instance MonadUnique (IOEnv (Env gbl lcl)) where getUniqueM = newUnique diff --git a/compiler/GHC/Tc/Utils/TcMType.hs b/compiler/GHC/Tc/Utils/TcMType.hs index 89614378cd..d0afe71560 100644 --- a/compiler/GHC/Tc/Utils/TcMType.hs +++ b/compiler/GHC/Tc/Utils/TcMType.hs @@ -770,13 +770,11 @@ newMetaTyVarName :: FastString -> TcM Name -- the unifier; see GHC.Tc.Utils.Unify.nicer_to_update_tv1, and -- GHC.Tc.Solver.Canonical.canEqTyVarTyVar (nicer_to_update_tv2) newMetaTyVarName str - = do { uniq <- newUnique - ; return (mkSystemName uniq (mkTyVarOccFS str)) } + = newSysName (mkTyVarOccFS str) cloneMetaTyVarName :: Name -> TcM Name cloneMetaTyVarName name - = do { uniq <- newUnique - ; return (mkSystemName uniq (nameOccName name)) } + = newSysName (nameOccName name) -- See Note [Name of an instantiated type variable] {- Note [Name of an instantiated type variable] |