Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/423f6dbf96fcf909570e91196fe7ad3a1cabb055 >--------------------------------------------------------------- commit 423f6dbf96fcf909570e91196fe7ad3a1cabb055 Author: Ian Lynagh <[email protected]> Date: Sun Jul 24 16:45:47 2011 +0100 Fix build in 7.2 branch Merge the part of commit 2329833d4f3143d781db3448785fd395e8dba71c Author: David Terei <[email protected]> Date: Wed Jul 20 16:27:28 2011 -0700 Format fixes that defines typInstErr. >--------------------------------------------------------------- compiler/typecheck/TcInstDcls.lhs | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/compiler/typecheck/TcInstDcls.lhs b/compiler/typecheck/TcInstDcls.lhs index 8c59b8b..bea7362 100644 --- a/compiler/typecheck/TcInstDcls.lhs +++ b/compiler/typecheck/TcInstDcls.lhs @@ -422,6 +422,9 @@ tcInstDecls1 tycl_decls inst_decls deriv_decls deriv_inst_info ++ local_info, aux_binds `plusHsValBinds` deriv_binds) }}} + where + typInstErr = ptext $ sLit $ "Can't create hand written instances of Typeable in Safe" + ++ " Haskell! Can only derive them" addInsts :: [InstInfo Name] -> TcM a -> TcM a addInsts infos thing_inside _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
