X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=b5973f722c3f7d7c850ceeea84ca3e61b045c8ea;hb=17879095049f5705c9734cab4f4c5d56f61f81a7;hp=694d07c8f7aa1c8447d3854550a1526a6d902ae2;hpb=dbb27b50948726c09fae681bca921ba3c00d859b;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs index 694d07c..b5973f7 100644 --- a/ghc/compiler/typecheck/TcTyDecls.lhs +++ b/ghc/compiler/typecheck/TcTyDecls.lhs @@ -48,7 +48,7 @@ import Type ( tyVarsOfTypes, splitFunTy, applyTys, ) import TysWiredIn ( unitTy ) import VarSet ( intersectVarSet, isEmptyVarSet ) -import PrelNames ( unpackCStringIdKey, unpackCStringUtf8IdKey ) +import PrelNames ( unpackCStringName, unpackCStringUtf8Name ) import ListSetOps ( equivClasses ) \end{code} @@ -263,8 +263,8 @@ mkRecordSelector tycon fields@((first_con, first_field_label) : other_fields) -- data type use the same type variables = checkTc (all (== field_ty) other_tys) (fieldTypeMisMatch field_name) `thenTc_` - tcLookupGlobalId unpackCStringIdName `thenTc` \ unpack_id -> - tcLookupGlobalId unpackCStringUtf8IdName `thenTc` \ unpackUtf8_id -> + tcLookupGlobalId unpackCStringName `thenTc` \ unpack_id -> + tcLookupGlobalId unpackCStringUtf8Name `thenTc` \ unpackUtf8_id -> returnTc (mkRecordSelId tycon first_field_label unpack_id unpackUtf8_id) where field_ty = fieldLabelType first_field_label