X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDefaults.lhs;h=9da5d96fb550ac47c596a09878745dcfe5fd6950;hb=9e5f0a0f6848dd8234a83d8ff514365aa4717eea;hp=01d7fb23ddc1d970b731383e64c823219460cfd8;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDefaults.lhs b/compiler/typecheck/TcDefaults.lhs
index 01d7fb2..9da5d96 100644
--- a/compiler/typecheck/TcDefaults.lhs
+++ b/compiler/typecheck/TcDefaults.lhs
@@ -5,11 +5,11 @@
 \section[TcDefaults]{Typechecking \tr{default} declarations}
 
 \begin{code}
-{-# OPTIONS_GHC -w #-}
+{-# OPTIONS -w #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module TcDefaults ( tcDefaults ) where
@@ -50,7 +50,7 @@ tcDefaults []
 	-- defaultDefaultTys
 
 tcDefaults [L locn (DefaultDecl [])]
-  = returnM (Just [])		-- Default declaration specifying no types
+  = return (Just [])		-- Default declaration specifying no types
 
 tcDefaults [L locn (DefaultDecl mono_tys)]
   = setSrcSpan locn 			$
@@ -61,7 +61,7 @@ tcDefaults [L locn (DefaultDecl mono_tys)]
 	; let deflt_clss | ovl_str   = [num_class, is_str_class]
 			 | otherwise = [num_class]
 
-	; tau_tys <- mappM (tc_default_ty deflt_clss) mono_tys
+	; tau_tys <- mapM (tc_default_ty deflt_clss) mono_tys
     
 	; return (Just tau_tys) }