[commit: ghc] master: Wibbles to the last merge, to fix the build (177134e)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/177134e9d1e465c113a16441b9d787d4de517635

>---------------------------------------------------------------

commit 177134e9d1e465c113a16441b9d787d4de517635
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jun 7 14:02:59 2012 +0100

    Wibbles to the last merge, to fix the build

>---------------------------------------------------------------

 compiler/typecheck/TcHsType.lhs     |    4 ++--
 compiler/typecheck/TcTyClsDecls.lhs |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcHsType.lhs b/compiler/typecheck/TcHsType.lhs
index e98191d..8051847 100644
--- a/compiler/typecheck/TcHsType.lhs
+++ b/compiler/typecheck/TcHsType.lhs
@@ -19,13 +19,13 @@ module TcHsType (
 
                 -- Type checking type and class decls
 	kcTyClTyVars, tcTyClTyVars,
-        tcHsArgType, tcHsConArgType, tcDataKindSig, 
+        tcHsConArgType, tcDataKindSig, 
         tcClassSigType, 
 
 		-- Kind-checking types
                 -- No kind generalisation, no checkValidType
 	kcHsTyVarBndrs, tcHsTyVarBndrs, 
-        tcHsLiftedType, 
+        tcHsLiftedType, tcHsOpenType,
 	tcLHsType, tcCheckLHsType, 
         tcHsContext, tcInferApps, tcHsArgTys,
 
diff --git a/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs
index 1cef0f7..bb1370e 100644
--- a/compiler/typecheck/TcTyClsDecls.lhs
+++ b/compiler/typecheck/TcTyClsDecls.lhs
@@ -433,7 +433,7 @@ kcConDecl (ConDecl { con_name = name, con_qvars = ex_tvs
   = addErrCtxt (dataConCtxt name) $
     kcHsTyVarBndrs False ex_tvs $ \ _ -> 
     do { _ <- tcHsContext ex_ctxt
-       ; mapM_ (tcHsArgType . getBangType) (hsConDeclArgTys details)
+       ; mapM_ (tcHsOpenType . getBangType) (hsConDeclArgTys details)
        ; _ <- tcConRes res
        ; return () }
 \end{code}