-import TcEnv ( tcLookupGlobalValueByKey )
-import TcType ( TcType(..), TcRhoType(..), TcMaybe, TcTyVarSet(..),
- tcInstType, tcInstTcType, zonkTcType )
-
-import Bag ( Bag, emptyBag, unitBag, unionBags, listToBag, consBag )
-import Class ( Class(..), GenClass, ClassInstEnv(..), getClassInstEnv )
-import Id ( GenId, idType, mkInstId )
-import MatchEnv ( lookupMEnv, insertMEnv )
-import Name ( Name )
-import NameTypes( ShortName, mkShortName )
+import TcEnv ( TcIdSet, tcGetInstEnv, tcLookupId )
+import InstEnv ( InstLookupResult(..), lookupInstEnv )
+import TcMType ( zonkTcType, zonkTcTypes, zonkTcPredType,
+ zonkTcThetaType, tcInstTyVar, tcInstType,
+ )
+import TcType ( Type, TcType, TcThetaType, TcPredType, TcTauType, TcTyVarSet,
+ SourceType(..), PredType, ThetaType,
+ tcSplitForAllTys, tcSplitForAllTys,
+ tcSplitMethodTy, tcSplitRhoTy, tcFunArgTy,
+ isIntTy,isFloatTy, isIntegerTy, isDoubleTy,
+ tcIsTyVarTy, mkPredTy, mkTyVarTy, mkTyVarTys,
+ tyVarsOfType, tyVarsOfTypes, tyVarsOfPred, tidyPred,
+ isClassPred, isTyVarClassPred, isLinearPred,
+ getClassPredTys, getClassPredTys_maybe, mkPredName,
+ tidyType, tidyTypes, tidyFreeTyVars,
+ tcCmpType, tcCmpTypes, tcCmpPred
+ )
+import CoreFVs ( idFreeTyVars )
+import Class ( Class )
+import Id ( Id, idName, idType, mkUserLocal, mkSysLocal, mkLocalId, setIdUnique )
+import PrelInfo ( isStandardClass, isCcallishClass, isNoDictClass )
+import Name ( Name, mkMethodOcc, getOccName )
+import PprType ( pprPred, pprParendType )
+import Subst ( emptyInScopeSet, mkSubst,
+ substTy, substTyWith, substTheta, mkTyVarSubst, mkTopTyVarSubst
+ )
+import Literal ( inIntRange )
+import VarEnv ( TidyEnv, lookupSubstEnv, SubstResult(..) )
+import VarSet ( elemVarSet, emptyVarSet, unionVarSet )
+import TysWiredIn ( floatDataCon, doubleDataCon )
+import PrelNames( fromIntegerName, fromRationalName )
+import Util ( thenCmp, equalLength )
+import BasicTypes( IPName(..), mapIPName, ipNameName )
+
+import Bag